summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge Android RHEADmasterXin Li2020-09-0816-821/+182
|\
| * Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-2716-821/+182
|/|
| * [automerger skipped] DO NOT MERGE: Prevent cluster service crash if video cod...Roberto Perez2020-06-260-0/+0
| |\
| | * [automerger skipped] DO NOT MERGE: Prevent cluster service crash if video cod...android11-devRoberto Perez2020-06-260-0/+0
| | |\
| | | * [automerger skipped] DO NOT MERGE: Prevent cluster service crash if video cod...Roberto Perez2020-06-260-0/+0
| | | |\
| | | | * [automerger skipped] DO NOT MERGE: Prevent cluster service crash if video cod...Roberto Perez2020-06-260-0/+0
| | | | |\
| | | | | * DO NOT MERGE: Prevent cluster service crash if video codec initialization failsRoberto Perez2020-06-241-9/+18
| * | | | | Change shareduserid and fix references to deprecated APIs am: 7128bd08c5Roberto Perez2020-06-225-38/+57
| |\| | | |
| | * | | | Change shareduserid and fix references to deprecated APIsRoberto Perez2020-06-225-38/+57
| * | | | | Merge "Make sure that car is disconnected" into rvc-dev am: 9fe295502eTreeHugger Robot2020-05-292-1/+9
| |\| | | |
| | * | | | Merge "Make sure that car is disconnected" into rvc-devTreeHugger Robot2020-05-292-1/+9
| | |\ \ \ \
| | | * | | | Make sure that car is disconnectedEric Jeong2020-05-282-1/+9
| * | | | | | Merge "Use customizable media source icon in the cluster." into rvc-dev am: 7...TreeHugger Robot2020-05-281-1/+1
| |\| | | | |
| | * | | | | Merge "Use customizable media source icon in the cluster." into rvc-devTreeHugger Robot2020-05-281-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Use customizable media source icon in the cluster.Alexander Mishkovets2020-05-261-1/+1
| * | | | | | Don't throw Exception if ClusterDisplay isn't ready. am: b758da0971Yuncheol Heo2020-05-271-59/+35
| |\| | | | |
| | * | | | | Don't throw Exception if ClusterDisplay isn't ready.Yuncheol Heo2020-05-271-59/+35
| | |/ / / /
| * | | | | Remove NetworkedVirtualDisplay am: 66e02249efCalvin Huang2020-05-205-680/+2
| |\| | | |
| | * | | | Remove NetworkedVirtualDisplayCalvin Huang2020-05-195-680/+2
| * | | | | Remove the permission CAR_DISPLAY_IN_CLUSTER from FakeFreeNavigationActivity....Yuncheol Heo2020-05-123-12/+1
| |\| | | |
| | * | | | Remove the permission CAR_DISPLAY_IN_CLUSTER from FakeFreeNavigationActivity.Yuncheol Heo2020-05-113-12/+1
| * | | | | Merge "Clear navstate on service state unspecified or locked" into rvc-dev am...Peter Li2020-05-062-3/+42
| |\| | | |
| | * | | | Merge "Clear navstate on service state unspecified or locked" into rvc-devPeter Li2020-05-062-3/+42
| | |\ \ \ \
| | | * | | | Clear navstate on service state unspecified or lockedPeter Li2020-04-302-3/+42
| * | | | | | Add Distraction optimized metadata to Cluster am: 7b946cf375Peter Li2020-04-141-0/+2
| |\| | | | |
| | * | | | | Add Distraction optimized metadata to ClusterPeter Li2020-04-141-0/+2
| | |/ / / /
| * | | | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterandroid-r-beta-3android-r-beta-2Xin Li2020-04-090-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-maste...Xin Li2020-03-190-0/+0
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| | * | | | | Use CarOccupantZoneManager to get the Cluster display. am: 2a02fa1cd1Yuncheol Heo2020-03-252-39/+41
| | |\| | | |
| | | * | | | Use CarOccupantZoneManager to get the Cluster display.Yuncheol Heo2020-03-252-39/+41
| | * | | | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901...Xin Li2020-03-190-0/+0
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | |
* | | | | | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li2020-03-180-0/+0
|\| | | | | |
| * | | | | | Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 201a0667b3 am: afaa...Automerger Merge Worker2020-03-060-0/+0
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| | * | | | | Update cluster to use new media API am: 19e2092c0fAutomerger Merge Worker2020-03-111-2/+5
| | |\| | | |
| | | * | | | Update cluster to use new media APISimon Dai2020-03-101-2/+5
| | * | | | | [automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am...Automerger Merge Worker2020-03-060-0/+0
| | |\ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / /
* | | | | | Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 201a0667b3Automerger Merge Worker2020-03-060-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge stage-aosp-master to aosp-master - DO NOT MERGEandroid-r-preview-4android-r-preview-3android-r-preview-2Bill Yi2020-03-058-61/+247
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| | | * | | | Merge "Fix "Rerouting.." text when no nav state is sent"TreeHugger Robot2020-01-271-1/+2
| | | |\ \ \ \
| | | | * | | | Fix "Rerouting.." text when no nav state is sentPeter Li2020-01-221-1/+2
| | | * | | | | Merge "Add support for lane guidance transparency"Peter Li2020-01-233-6/+55
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | Add support for lane guidance transparencyPeter Li2020-01-173-6/+55
| | | * | | | | [automerger skipped] Convert DirectRenderingCluster to Android.bp am: f3a5460...Automerger Merge Worker2020-01-170-0/+0
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | [automerger skipped] Convert DirectRenderingCluster to Android.bp am: f3a5460...Automerger Merge Worker2020-01-170-0/+0
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
* | | | | | | | [automerger skipped] Convert DirectRenderingCluster to Android.bpandroid10-sidebranchColin Cross2020-01-170-0/+0
|\| | | | | | |
| * | | | | | | Convert DirectRenderingCluster to Android.bpandroid-r-preview-1Colin Cross2020-01-165-111/+74
| | | * | | | | [automerger skipped] Convert DirectRenderingCluster to Android.bp am: d8810bc...Automerger Merge Worker2020-01-170-0/+0
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Convert DirectRenderingCluster to Android.bp am: d8810bc6f5Automerger Merge Worker2020-01-175-111/+74
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
* | | | | | | | Convert DirectRenderingCluster to Android.bpColin Cross2020-01-165-111/+74