Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
486,219 Commits 3 Branches 0 Tags
700fa1f40d09cffd7f6d4e68be97fa4e46c92e14
Commit Graph

486219 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gopalakrishnan Nallasamy
700fa1f40d Merge "MediaMuxer:Maintain proper state after stop()" into rvc-dev am: 7f42b75525 
Change-Id: Iaee04c01e89ad33cd71e15ab9211ea88cd209ba7
 2020-05-19 00:49:06 +00:00
Alan Viverette
628d626460 Merge "[ProgressBar] Fix: Media volume bar indicates a wrong value" into rvc-dev-plus-aosp 2020-05-19 00:38:41 +00:00
Gopalakrishnan Nallasamy
7f42b75525 Merge "MediaMuxer:Maintain proper state after stop()" into rvc-dev 2020-05-19 00:33:30 +00:00
Amit Mahajan
963957ed4d Merge "DUT fail to unlock SIM after selecting Home IMSI from STK When unlock SIM pin,SIM begin refresh, and the UiccCardApp was disposed." am: 62120dcc8c am: 67bec2d79b 
Change-Id: I2395255c3da76bb1da99fe243a280c65ba9baf95
 2020-05-19 00:16:28 +00:00
Amit Mahajan
67bec2d79b Merge "DUT fail to unlock SIM after selecting Home IMSI from STK When unlock SIM pin,SIM begin refresh, and the UiccCardApp was disposed." am: 62120dcc8c 
Change-Id: I50ca70c0e9a3a20bc64604e9e05cec619111679f
 2020-05-18 23:55:10 +00:00
Amit Mahajan
62120dcc8c Merge "DUT fail to unlock SIM after selecting Home IMSI from STK When unlock SIM pin,SIM begin refresh, and the UiccCardApp was disposed." 2020-05-18 23:38:22 +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
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
TreeHugger Robot
b8ec05c9f0 Merge "Fix UCE docs" into rvc-dev 2020-05-18 23:04:41 +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
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
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
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
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
Peter Kalauskas
8737830ed4 Merge "Check user unlocked before write to /data/system_ce/0/snapshots" 2020-05-18 21:50:20 +00:00
Patrick Baumann
72116d95f9 Merge "Remove usages of Slog.wtf" into rvc-dev am: 4d61690ba0 
Change-Id: I1a4d27fabfafa27c9f60e3d3a25e5c6c82450b35
 2020-05-18 21:47:17 +00:00
TreeHugger Robot
6bbe3e40a7 Merge "Don't restart non-system DataLoaders on reboot." into rvc-dev am: afdf940276 
Change-Id: I48e7d1ed40e787fb63445d68aa0e198e555c0857
 2020-05-18 21:46:51 +00:00
Patrick Baumann
756e0cb1b9 Merge "Doc update re use of MATCH_UNINSTALLED flag" into rvc-dev am: ce6252e5a4 
Change-Id: I211dfe09b3cfa182d524fbdbebd93d4d37e3716f
 2020-05-18 21:46:17 +00:00
Patrick Baumann
4d61690ba0 Merge "Remove usages of Slog.wtf" into rvc-dev 2020-05-18 21:39:57 +00:00
TreeHugger Robot
afdf940276 Merge "Don't restart non-system DataLoaders on reboot." into rvc-dev 2020-05-18 21:36:15 +00:00
Patrick Baumann
ce6252e5a4 Merge "Doc update re use of MATCH_UNINSTALLED flag" into rvc-dev 2020-05-18 21:31:02 +00:00
Brad Ebinger
1735254a44 Fix UCE docs 
Clarify some of the docs for UCE Intent.

Fixes: 156114453
test: docs only
Change-Id: I01617d0741055e347e05bdbd5eb5a6825f896e73
 2020-05-18 21:22:26 +00:00
Sasha Smundak
bf815330eb Convert cmds/device_config/Android.mk file to Android.bp 
See build/soong/README.md for more information.

Bug: 122332340
Test: treehugger
Change-Id: If9d673fa95b2adf7ea494c138960612ffad8e59f
 2020-05-18 14:17:47 -07:00
Automerger Merge Worker
af88c79308 Merge "Merge "Pass -XX:PerfettoHprof=true to ART." am: ec5055f307 am: a37238fde7" into rvc-dev-plus-aosp 2020-05-18 21:16:19 +00:00
Govinda Wasserman
849f819d3e Merge "Suppress Assistant handles when device is not provisioned" into rvc-dev am: 44dbb19a9d 
Change-Id: I9c7353de8d1fc94f73b93640dbd66ebdb2f6d3f7
 2020-05-18 21:15:56 +00:00
Florian Mayer
044e2806e5 Merge "Pass -XX:PerfettoHprof=true to ART." am: ec5055f307 am: a37238fde7 
Change-Id: I00d60a78092a07f9284590f267f76f01124032a4
 2020-05-18 21:15:52 +00:00
Govinda Wasserman
44dbb19a9d Merge "Suppress Assistant handles when device is not provisioned" into rvc-dev 2020-05-18 21:05:19 +00:00
Ruchir Rastogi
34e0af1f65 Merge "Refactor puller of {Mobile|Wifi}BytesTransfer(ByFgBg)" into rvc-dev am: e6c5da62fb 
Change-Id: I55c3004e76443fdf1d751d776ea6c5ec935a169f
 2020-05-18 20:59:56 +00:00
TreeHugger Robot
1174d7e8f5 Merge "[SM13] Create new atom for reporting data usage per rat and per sub" into rvc-dev am: 10992382d1 
Change-Id: Ia77e6b38cb3c19c7c115587fd823baa7712cd778
 2020-05-18 20:59:34 +00:00
Collin Fijalkovich
5f2f1b3feb Merge changes from topic "dump-cacheinfo" into rvc-dev am: acb2bba925 
Change-Id: I2eae20fcd0ff8c92f2392c59da05d29a9ece4204
 2020-05-18 20:59:05 +00:00
Daniel Colascione
be2c17c588 Maintain global list of caches; purge on low memory am: 8c239da8d5 
Change-Id: Ie6eb25b53de3be6fadf08cae1f882120ba06781a
 2020-05-18 20:59:01 +00:00
Mike Digman
49260dd983 Move rotate button logging to Westworld 
Fixes: 147508316
Test: statsd_testdrive 90
Change-Id: Ibf71098dad6a1cae354ec83d461c4e0b42c47065
(cherry picked from commit 6be1669a8e)
 2020-05-18 20:58:48 +00:00
Florian Mayer
a37238fde7 Merge "Pass -XX:PerfettoHprof=true to ART." am: ec5055f307 
Change-Id: If07ac8264a21717a75a7956a642cf90b3fcbcea0
 2020-05-18 20:58:20 +00:00
Ruchir Rastogi
e6c5da62fb Merge "Refactor puller of {Mobile|Wifi}BytesTransfer(ByFgBg)" into rvc-dev 2020-05-18 20:55:27 +00:00