Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
524,621 Commits 3 Branches 0 Tags
f71ece2562860e655bcd31b6270efa7dcda72842
Commit Graph

524621 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Heemin Seog
f71ece2562 [automerger skipped] Merge "Modify aspects of the phone sysui which is not relevant to car sysui" into rvc-dev am: eab08c2c0f am: 4087415dde -s ours am: ea645ebd63 -s ours 
am skip reason: Change-Id I37e849141cc1ffe2e9bd8b0841ac33901ff845e9 with SHA-1 4764fba146 is in history

Change-Id: If392992181ee86a64b1a17c11f3d7563847521db
 2020-05-18 23:34:29 +00:00
Heemin Seog
ea645ebd63 [automerger skipped] Merge "Modify aspects of the phone sysui which is not relevant to car sysui" into rvc-dev am: eab08c2c0f am: 4087415dde -s ours 
am skip reason: Change-Id I37e849141cc1ffe2e9bd8b0841ac33901ff845e9 with SHA-1 4764fba146 is in history

Change-Id: Ifff92b59f6c532b67350305dbfad64a50d0ab44f
 2020-05-18 23:21:35 +00:00
Beverly Tai
9c36b3eac9 Merge "Revert "Don't readd pending notifs to NEM's allNotifs list"" into rvc-dev am: a1ad29da2d am: 3e5788f7e6 am: b5b1489a80 
Change-Id: I8625fe1ea4fee2544ccfec19f82d9fd45b61af43
 2020-05-18 23:17:52 +00:00
Mike Digman
3b8fa157a2 Merge "Add pinned target indicator to Sharesheet, update visuals" into rvc-dev am: aa96eb5733 am: f5f2c3f413 am: 2d05148354 
Change-Id: I64640fba3ade82e899636982031526b45d2b0125
 2020-05-18 23:17:42 +00:00
TreeHugger Robot
67e020260e Merge "Fix UCE docs" into rvc-dev am: b8ec05c9f0 am: baa92662b4 am: ae40c1a22d 
Change-Id: I34cea6a257f94d03b62f51ad62e788d3989d5a74
 2020-05-18 23:17:32 +00:00
Treehugger Robot
ec8f94cea9 Merge "Convert cmds/device_config/Android.mk file to Android.bp" am: 35f1fb7ff4 am: da0482d77a am: 075cbbf44f am: ce91f22d90 
Change-Id: If5d16c435e0c6a2291a06cf01f40030606f2a1e6
 2020-05-18 23:17:19 +00:00
Beverly Tai
b5b1489a80 Merge "Revert "Don't readd pending notifs to NEM's allNotifs list"" into rvc-dev am: a1ad29da2d am: 3e5788f7e6 
Change-Id: Id90792e359b2a8691cc3b3f5c96dc53f634b49f4
 2020-05-18 23:16:51 +00:00
Nicholas Ambur
733e2ce884 Merge "fix calling SoundTriggerMiddleware in safeMode" into rvc-dev am: de1f26432c am: 3299b363d2 am: 9ca1051114 
Change-Id: I22ffeaeb945b848756c7662696b1c1c7b8c467e3
 2020-05-18 23:16:43 +00:00
Mike Digman
2d05148354 Merge "Add pinned target indicator to Sharesheet, update visuals" into rvc-dev am: aa96eb5733 am: f5f2c3f413 
Change-Id: I657276cb0e77f3ba1b9d12a53bdebe9b71a4b8bd
 2020-05-18 23:16:37 +00:00
TreeHugger Robot
ae40c1a22d Merge "Fix UCE docs" into rvc-dev am: b8ec05c9f0 am: baa92662b4 
Change-Id: Ie4585aa58dac0266cc2fd5653ace6207f2ea0264
 2020-05-18 23:16:13 +00:00
Beverly Tai
3e5788f7e6 Merge "Revert "Don't readd pending notifs to NEM's allNotifs list"" into rvc-dev am: a1ad29da2d 
Change-Id: Id4b3e6fc2b1ae99dbc68256aafd4749a1a9d9ffe
 2020-05-18 23:16:06 +00:00
Mike Digman
f5f2c3f413 Merge "Add pinned target indicator to Sharesheet, update visuals" into rvc-dev am: aa96eb5733 
Change-Id: I952e52cd4384ab5a5c56557e4a64241012286b90
 2020-05-18 23:15:37 +00:00
TreeHugger Robot
f405ca2546 Merge "Move rotate button logging to Westworld" into rvc-dev am: 89fde50c8e am: 42ac88f5b8 am: 036ba6e0e4 
Change-Id: Ie068aa9264031b9debfb944d601d4e7d8821e2fc
 2020-05-18 23:15:35 +00:00
Beverly Tai
a1ad29da2d Merge "Revert "Don't readd pending notifs to NEM's allNotifs list"" into rvc-dev 2020-05-18 23:13:36 +00:00
Beverly Tai
1b87943cad Revert "Don't readd pending notifs to NEM's allNotifs list" 
This reverts commit cb5e62cc50.

Reason for revert: cause of regression b/156874301
Fixes: 156874301
Change-Id: If88f1d508180ae7b2e40f11386d5a6b66b639750
 2020-05-18 23:13:23 +00:00
Mike Digman
aa96eb5733 Merge "Add pinned target indicator to Sharesheet, update visuals" into rvc-dev 2020-05-18 23:12:15 +00:00
TreeHugger Robot
baa92662b4 Merge "Fix UCE docs" into rvc-dev am: b8ec05c9f0 
Change-Id: I40924079a2fa2c2db2eec7346e3989c4cbed6186
 2020-05-18 23:09:39 +00:00
Heemin Seog
4087415dde Merge "Modify aspects of the phone sysui which is not relevant to car sysui" into rvc-dev am: eab08c2c0f 
Change-Id: I7beb62a94fdb8091179098e705f9fb4a98c880f2
 2020-05-18 23:09:35 +00:00
TreeHugger Robot
b8ec05c9f0 Merge "Fix UCE docs" into rvc-dev 2020-05-18 23:04:41 +00:00
Treehugger Robot
ce91f22d90 Merge "Convert cmds/device_config/Android.mk file to Android.bp" am: 35f1fb7ff4 am: da0482d77a am: 075cbbf44f 
Change-Id: I4c4404e6101fe14b697999d22a285d5d11b86b53
 2020-05-18 23:03:33 +00:00
Nicholas Ambur
9ca1051114 Merge "fix calling SoundTriggerMiddleware in safeMode" into rvc-dev am: de1f26432c am: 3299b363d2 
Change-Id: I960a06f88b87273044b83ffa50814de00c66c54f
 2020-05-18 23:03:23 +00:00
TreeHugger Robot
036ba6e0e4 Merge "Move rotate button logging to Westworld" into rvc-dev am: 89fde50c8e am: 42ac88f5b8 
Change-Id: I2240ded356a526544a6773d01e348536ac10127c
 2020-05-18 23:03:04 +00:00
Treehugger Robot
075cbbf44f Merge "Convert cmds/device_config/Android.mk file to Android.bp" am: 35f1fb7ff4 am: da0482d77a 
Change-Id: I2f9c415fecc8ac310c58ae805fb0995bfb0e640d
 2020-05-18 23:02:29 +00:00
Nicholas Ambur
3299b363d2 Merge "fix calling SoundTriggerMiddleware in safeMode" into rvc-dev am: de1f26432c 
Change-Id: I9705dc926f3fb5f28a438acb9c433391e52e3abd
 2020-05-18 22:58:52 +00:00
Nicholas Ambur
de1f26432c Merge "fix calling SoundTriggerMiddleware in safeMode" into rvc-dev 2020-05-18 22:52:09 +00:00
Hunter Knepshield
2ea9511187 Merge "Reapply aosp/970247 to fix SubInfo#toString." into rvc-dev am: 7eeed0981e am: 15e6f1e9f0 am: af14bbe0e0 
Change-Id: I30738d88a0202fc32b51c22e143af076028639df
 2020-05-18 22:50:36 +00:00
TreeHugger Robot
d20c4aae3a [automerger skipped] Merge "Pass -XX:PerfettoHprof=true to ART." into rvc-dev am: 082c8b68ae -s ours am: d719d07650 -s ours am: 85ad8f8988 -s ours 
am skip reason: Change-Id Ibc26afc5e9e8744839dce7e863d0635788ad9507 with SHA-1 7dc66b31c1 is in history

Change-Id: I1a52f99f51f618ce436e7862d22cbeb7e13a381e
 2020-05-18 22:49:57 +00:00
Treehugger Robot
e7264a69be Merge "Add isStable in Parcelable interface" am: 9bb27b0311 am: a5ace2e7be am: 27bfb77024 am: 6c310a5a1e 
Change-Id: I2eec8edbbecaf197731505ecd282ddb2928f8e05
 2020-05-18 22:49:19 +00:00
Peter Kalauskas
bc3b6026e9 [automerger skipped] Merge "Check user unlocked before write to /data/system_ce/0/snapshots" am: 8737830ed4 am: 00ac337a69 -s ours am: c54f85531d -s ours am: 900efd6fce -s ours 
am skip reason: Change-Id Ie9d4a28008adc93e27bc8ab015a3a6507428c3e4 with SHA-1 2f9987f507 is in history

Change-Id: Ia61eb1f908d8c6acf4825f4a88cce993c931956f
 2020-05-18 22:49:04 +00:00
TreeHugger Robot
42ac88f5b8 Merge "Move rotate button logging to Westworld" into rvc-dev am: 89fde50c8e 
Change-Id: Ie056d8c85b8d583bdd3892ec174ab5b4992ca749
 2020-05-18 22:48:39 +00:00
Treehugger Robot
da0482d77a Merge "Convert cmds/device_config/Android.mk file to Android.bp" am: 35f1fb7ff4 
Change-Id: Ibf96845708315eb8592578bb83657c0e37d899a1
 2020-05-18 22:48:15 +00:00
TreeHugger Robot
89fde50c8e Merge "Move rotate button logging to Westworld" into rvc-dev 2020-05-18 22:44:57 +00:00
Hunter Knepshield
af14bbe0e0 Merge "Reapply aosp/970247 to fix SubInfo#toString." into rvc-dev am: 7eeed0981e am: 15e6f1e9f0 
Change-Id: Ieb9436432a24bde7522a08ebfbebb52137f14d43
 2020-05-18 22:35:00 +00:00
TreeHugger Robot
85ad8f8988 [automerger skipped] Merge "Pass -XX:PerfettoHprof=true to ART." into rvc-dev am: 082c8b68ae -s ours am: d719d07650 -s ours 
am skip reason: Change-Id Ibc26afc5e9e8744839dce7e863d0635788ad9507 with SHA-1 7dc66b31c1 is in history

Change-Id: I52cdf8e93b9875e280c744b0b3f19df1ef779d6a
 2020-05-18 22:34:38 +00:00
Treehugger Robot
6c310a5a1e Merge "Add isStable in Parcelable interface" am: 9bb27b0311 am: a5ace2e7be am: 27bfb77024 
Change-Id: Iacdc816adcd402130441f2ca16d51d0675d51ece
 2020-05-18 22:34:02 +00:00
Hunter Knepshield
15e6f1e9f0 Merge "Reapply aosp/970247 to fix SubInfo#toString." into rvc-dev am: 7eeed0981e 
Change-Id: I8f97fcc445aa504fb29bf8e6f6bde06533f91322
 2020-05-18 22:33:52 +00:00
Peter Kalauskas
900efd6fce [automerger skipped] Merge "Check user unlocked before write to /data/system_ce/0/snapshots" am: 8737830ed4 am: 00ac337a69 -s ours am: c54f85531d -s ours 
am skip reason: Change-Id Ie9d4a28008adc93e27bc8ab015a3a6507428c3e4 with SHA-1 2f9987f507 is in history

Change-Id: Idc08fa45ff5625681fec277bb5a904cc46e3194f
 2020-05-18 22:33:33 +00:00
TreeHugger Robot
d719d07650 [automerger skipped] Merge "Pass -XX:PerfettoHprof=true to ART." into rvc-dev am: 082c8b68ae -s ours 
am skip reason: Change-Id Ibc26afc5e9e8744839dce7e863d0635788ad9507 with SHA-1 7dc66b31c1 is in history

Change-Id: I2aef025b0cb9cb89f2fc727817d4319e27b8fe1a
 2020-05-18 22:33:23 +00:00
Hunter Knepshield
7eeed0981e Merge "Reapply aosp/970247 to fix SubInfo#toString." into rvc-dev 2020-05-18 22:30:16 +00:00
Hunter Knepshield
e23886b901 Reapply aosp/970247 to fix SubInfo#toString. 
Looks like somewhere along the line this was partially overwritten by
another change. This makes the toString value consistent and stops the
MNC field from running into the country ISO code.

Test: compilation (trivial)
Change-Id: Ifdc00d340ae8ce31c224decebdd6c7aa4230bdb7
Bug: 8675309
 2020-05-18 22:29:59 +00:00
Treehugger Robot
35f1fb7ff4 Merge "Convert cmds/device_config/Android.mk file to Android.bp" 2020-05-18 22:27:56 +00:00
Patrick Baumann
45a0dd7a47 Merge "Remove usages of Slog.wtf" into rvc-dev am: 4d61690ba0 am: 72116d95f9 am: 48d0bcd5c5 
Change-Id: I0f6b528d8fb0b0ae9725315b62d4eb80b080a9ed
 2020-05-18 22:19:58 +00:00
TreeHugger Robot
ef4d4c3709 Merge "Don't restart non-system DataLoaders on reboot." into rvc-dev am: afdf940276 am: 6bbe3e40a7 am: a5bd7e0917 
Change-Id: I4fc6c32476c423f6ffb016ec21f94ee6d8c2f53f
 2020-05-18 22:19:47 +00:00
Patrick Baumann
0564a89529 Merge "Doc update re use of MATCH_UNINSTALLED flag" into rvc-dev am: ce6252e5a4 am: 756e0cb1b9 am: 317ffa96e0 
Change-Id: Ic4095d27392a0b1d3803a0b2e71a2d404f740724
 2020-05-18 22:19:27 +00:00
Treehugger Robot
27bfb77024 Merge "Add isStable in Parcelable interface" am: 9bb27b0311 am: a5ace2e7be 
Change-Id: Ie4e99da3fb2f98222709960a7e6d1148ef18b643
 2020-05-18 22:19:24 +00:00
Peter Kalauskas
c54f85531d [automerger skipped] Merge "Check user unlocked before write to /data/system_ce/0/snapshots" am: 8737830ed4 am: 00ac337a69 -s ours 
am skip reason: Change-Id Ie9d4a28008adc93e27bc8ab015a3a6507428c3e4 with SHA-1 2f9987f507 is in history

Change-Id: I11a756cd26d7f978924fc0be1c0d162852a08519
 2020-05-18 22:18:55 +00:00
TreeHugger Robot
082c8b68ae Merge "Pass -XX:PerfettoHprof=true to ART." into rvc-dev 2020-05-18 22:17:56 +00:00
Treehugger Robot
a5ace2e7be Merge "Add isStable in Parcelable interface" am: 9bb27b0311 
Change-Id: Ia3ac39e9b47e2fdcebca868823dd6536d88f9860
 2020-05-18 22:16:05 +00:00
Treehugger Robot
9bb27b0311 Merge "Add isStable in Parcelable interface" 2020-05-18 22:11:37 +00:00
Peter Kalauskas
00ac337a69 Merge "Check user unlocked before write to /data/system_ce/0/snapshots" am: 8737830ed4 
Change-Id: Ibd0dba7358304f0e58ff72aec554c4f276aaa92d
 2020-05-18 22:08:38 +00:00