Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
528,083 Commits 3 Branches 0 Tags
c8df16e9aa2aed313c28c5c597e4e3e326bda35e
Commit Graph

18295 Commits

Author SHA1 Message Date
Automerger Merge Worker
39892f9da5 Merge "Merge "Fix CTS" into rvc-dev am: cf8ab8447e am: f9df81c4b5" into rvc-d1-dev-plus-aosp am: f6e2173676 am: cbe6a4cec1 
Change-Id: I9f28c2acc4e7b3d0716d0431bd71e2291688c3ea
 2020-04-29 15:14:58 +00:00
Mady Mellor
7e2ba8392e Merge "Fix CTS" into rvc-dev am: cf8ab8447e am: f9df81c4b5 
Change-Id: Id73ba9a576883cda713c969217789ac0f5ed0bac
 2020-04-29 14:38:37 +00:00
Mady Mellor
cf8ab8447e Merge "Fix CTS" into rvc-dev 2020-04-29 14:33:36 +00:00
TreeHugger Robot
61cf1a7460 Merge "Add RoleControllerManagerTest." into rvc-dev am: 447914fcfe am: 0b5b876873 am: a088f92936 am: 079191abb3 
Change-Id: If671819827f45d0db2259ad37ba2970740e62a7d
 2020-04-29 06:24:34 +00:00
TreeHugger Robot
a088f92936 Merge "Add RoleControllerManagerTest." into rvc-dev am: 447914fcfe am: 0b5b876873 
Change-Id: Ieb5eceadbb7fa3e8af73dc215c77b66d741def10
 2020-04-29 06:07:43 +00:00
TreeHugger Robot
447914fcfe Merge "Add RoleControllerManagerTest." into rvc-dev 2020-04-29 05:56:34 +00:00
Mady Mellor
a114b79392 Fix CTS 
* fix BubbleExtractor tests to work with this & better
  test things now that the channel is a tristate

Test: atest NotificationManagerTest BubbleExtractorTest
Bug: 155025024
Change-Id: I8b75c1b0087ca79cea29741e32c7c524cb056d04
 2020-04-28 20:06:03 -07:00
TreeHugger Robot
fee8247220 Merge "Don't remove OnAlarmListener mappings in the client" into rvc-dev am: 007a73c551 am: b7bd6ed8b5 am: 7f2d18a96d am: b5d4f0a84d 
Change-Id: I74734ec562af7cd51382e732913a1165056b7581
 2020-04-29 02:20:09 +00:00
TreeHugger Robot
7f2d18a96d Merge "Don't remove OnAlarmListener mappings in the client" into rvc-dev am: 007a73c551 am: b7bd6ed8b5 
Change-Id: Ieaa599b9ad4740a6a2f48f57a1c3b8c102ef33bf
 2020-04-29 01:44:39 +00:00
TreeHugger Robot
007a73c551 Merge "Don't remove OnAlarmListener mappings in the client" into rvc-dev 2020-04-29 01:09:32 +00:00
TreeHugger Robot
206146bd94 Merge "Maintain global list of caches; purge on low memory" 2020-04-29 00:51:05 +00:00
Suprabh Shukla
7d40780e39 Don't remove OnAlarmListener mappings in the client 
Removing the mapping is prone to races in keeping the state consistent
with the server. An inconsistent state can lead to multiple alarms on
the server for the same listener.

Test: atest CtsJobSchedulerTestCases doesn't fill the alarm queue with
more than one alarm.
atest CtsAlarmManagerTestCases

Bug: 154444435
Change-Id: Iaf11d5decb17fbf2366b49d9865231bf65dbdc41
 2020-04-28 15:37:21 -07:00
Daniel Colascione
22c2ddb201 Maintain global list of caches; purge on low memory 
Bug: 140788621
Test: m
Change-Id: I3ba88e0a6f6c0f26465903988e7432156bd5be20
 2020-04-28 15:33:00 -07:00
TreeHugger Robot
700411a38d Merge "Close heap dump ParcelFileDescriptor." into rvc-dev am: 48f0527199 am: fc1392ade0 am: c1b0af4ecd am: c3654b8f20 
Change-Id: Ib956714d1c1376339db4c5da857c785cee0b74d5
 2020-04-28 21:54:29 +00:00
TreeHugger Robot
fc1392ade0 Merge "Close heap dump ParcelFileDescriptor." into rvc-dev am: 48f0527199 
Change-Id: I5f76bb90769c098fe0de57a27bc9e7dc3a66ffc3
 2020-04-28 21:21:07 +00:00
TreeHugger Robot
48f0527199 Merge "Close heap dump ParcelFileDescriptor." into rvc-dev 2020-04-28 20:52:29 +00:00
Hai Zhang
a39cf78c63 Add RoleControllerManagerTest. 
Fixes: 155119713
Test: atest RoleControllerManagerTest
Change-Id: If90ba60cccbe1589365142a06d917a87b7a092ef
 2020-04-28 12:14:01 -07:00
TreeHugger Robot
c0dabd589e Merge "Update logging" into rvc-dev am: 94f8f6cb25 am: 07cfdcca55 am: 3f50a7e50a am: 36038cd292 
Change-Id: Ib3318f22561d9c6cdb1fc9cacae52fc787908ba3
 2020-04-28 18:44:30 +00:00
TreeHugger Robot
3f50a7e50a Merge "Update logging" into rvc-dev am: 94f8f6cb25 am: 07cfdcca55 
Change-Id: I3d063a3b5e741e5dc11e748b1de6856401ea06c0
 2020-04-28 18:05:50 +00:00
TreeHugger Robot
46779de570 Merge "Update logging" into rvc-dev am: 94f8f6cb25 
Change-Id: I4631ffd16aab1337d7d8072489d4f28de9e936dc
 2020-04-28 17:51:25 +00:00
Julia Reynolds
49467eebac Update logging 
Priority isn't used; shortcut is

Test: manual
Bug: 149651274
Change-Id: If6577c5588afe5e48787ae7e6bc528442fdb3423
 2020-04-28 14:50:01 +00:00
Alex Johnston
197f17c40d Merge "Update setOrganizationColor javadoc" into rvc-dev am: a077a8a0cc am: 2829be16f1 am: 58ff7c1d6c am: eca32ee5da 
Change-Id: Ie4a56c781b8654c2d0ab46c1d5a94703ad98d749
 2020-04-28 09:29:45 +00:00
Alex Johnston
58ff7c1d6c Merge "Update setOrganizationColor javadoc" into rvc-dev am: a077a8a0cc am: 2829be16f1 
Change-Id: I4786b44cab4e11e67d53be7d0af91ca7133460af
 2020-04-28 09:05:58 +00:00
Alex Johnston
83bd3e37fc Merge "Update setOrganizationColor javadoc" into rvc-dev am: a077a8a0cc 
Change-Id: I2d3684d7a6e68be39fd14d600ce3b201b926582f
 2020-04-28 08:51:17 +00:00
Alex Johnston
a077a8a0cc Merge "Update setOrganizationColor javadoc" into rvc-dev 2020-04-28 08:36:57 +00:00
Automerger Merge Worker
5d4c6d5cf5 Merge "Merge "Cache isSystemOrSystemUI on ContextImpl creation" into rvc-dev am: 9859a326c1 am: 360b08a9a4" into rvc-d1-dev-plus-aosp am: 39f5c1b5ea am: 528f1f0b4e 
Change-Id: I59d812cbf441f9abf6a024257d1d85facf21160d
 2020-04-28 05:24:30 +00:00
Chris Li
2063d7d7e9 Merge "Cache isSystemOrSystemUI on ContextImpl creation" into rvc-dev am: 9859a326c1 am: 360b08a9a4 
Change-Id: I1917ad674ca90bcddd16b1b4d33b84c0dbe8c981
 2020-04-28 04:44:10 +00:00
Chris Li
182f17606e Merge "Cache isSystemOrSystemUI on ContextImpl creation" into rvc-dev am: 9859a326c1 
Change-Id: Icbf8fcfad9eb2645faf1eff0cdbb6b0388b1773f
 2020-04-28 04:26:23 +00:00
Chris Li
9859a326c1 Merge "Cache isSystemOrSystemUI on ContextImpl creation" into rvc-dev 2020-04-28 04:02:05 +00:00
Kweku Adams
f1ddecc60e Close heap dump ParcelFileDescriptor. 
The file descriptor is only closed in certain situations. Explicitly
closing it to ensure we don't have any leaks.

Bug: 154277871
Test: take a system heap dump via developer options & and watch for StrictMode violation
Test: adb shell am dumpheap <system|another app> & and watch for StrictMode violation
Change-Id: I3ae3e270bcec18ba531055becfff32924c8f2a2d
 2020-04-27 18:43:09 +00:00
TreeHugger Robot
97da6eefdd Merge "Inform receivers of restart attempt previous visibility" into rvc-dev am: 756662fb2f am: 1af5be809b am: 9432c1937c am: 056faa3f38 
Change-Id: I0b95456cc5f9226b9c16f260b09ad3bf4d2691e2
 2020-04-27 18:42:46 +00:00
Diego Vela
beecb2799a Merge "Update Documentation for onActivityResult." into rvc-dev am: 7c59c63943 am: d92f5b3da1 am: d17c585190 am: 0165ac4c91 
Change-Id: I419061e5079bcaab654180628f63c02967d0a6c4
 2020-04-27 18:40:32 +00:00
TreeHugger Robot
9432c1937c Merge "Inform receivers of restart attempt previous visibility" into rvc-dev am: 756662fb2f am: 1af5be809b 
Change-Id: I4f67de7ffb883a26e81bc9c07e87724a1f61964c
 2020-04-27 18:39:25 +00:00
Chris Li
e7f4f30698 Cache isSystemOrSystemUI on ContextImpl creation 
When creating Context without a container Context, cache the value of #isSystemOrSystemUI().

Fix: 154161051
Test: atest FrameworksCoreTests:ContextTest
Change-Id: I1d16173c7da06a73d1338e3d6e75f5b56fcdbe23
 2020-04-27 11:35:31 -07:00
TreeHugger Robot
1bbe0b4efc Merge "Inform receivers of restart attempt previous visibility" into rvc-dev am: 756662fb2f 
Change-Id: I75848eccd8e398e3029faa20a64e58dfd970ee44
 2020-04-27 18:35:21 +00:00
TreeHugger Robot
756662fb2f Merge "Inform receivers of restart attempt previous visibility" into rvc-dev 2020-04-27 18:29:46 +00:00
Diego Vela
d17c585190 Merge "Update Documentation for onActivityResult." into rvc-dev am: 7c59c63943 am: d92f5b3da1 
Change-Id: I1cb98539d33f2650cf31514db9a78f5ba7749915
 2020-04-27 18:23:45 +00:00
Diego Vela
7aedfae0b1 Merge "Update Documentation for onActivityResult." into rvc-dev am: 7c59c63943 
Change-Id: Id885797db3cc7b3a141d96eaab3bb03c0c0a2f00
 2020-04-27 18:06:02 +00:00
Diego Vela
7c59c63943 Merge "Update Documentation for onActivityResult." into rvc-dev 2020-04-27 17:58:29 +00:00
Evan Rosky
8d1c24e0a5 Inform receivers of restart attempt previous visibility 
This way receivers like recents know whether the activity
was already visible before a restart attempt.

Bug: 154575664
Test: added test. Can also launch a running activity into
      split-primary and it won't expand it.
Change-Id: If59ee1615fa36bbe3af9412194a7f96b9377528a
 2020-04-27 09:13:31 -07:00
Diego Vela
6e99bfcd6c Update Documentation for onActivityResult. 
Update doc to be more accurate about when onActivityResult is called

Bug: 140608415
Test: n/a
Change-Id: If44b02719e18b3107b064d749396d896bed08f86
 2020-04-27 15:10:18 +00:00
Alex Johnston
6be8cda180 Update setOrganizationColor javadoc 
Background
* In Android R, the UI of the work challenge was
  updated to latest material spec which no longer
  uses the organization color.

Changes
* Update javadoc of setOrganizationColor mentioning
  the organization color will no longer affect the
  work challenge starting from R.

Bug: 153607870
Bug: 153607569
Test: verify no build breakages
Change-Id: I071f544e4fba1915d810fa741dbc79966f9e72f4
 2020-04-27 15:20:14 +01:00
Automerger Merge Worker
eaf02f0c2b Merge "Merge "Add factory reset protection policy Test API to DPM" into rvc-dev am: c5e9a48db8 am: 62e1784b45" into rvc-d1-dev-plus-aosp am: 0216a7d4cc am: c685485031 
Change-Id: If43b55621d7cbdba2ca0158165df1ce089b2a074
 2020-04-27 11:42:18 +00:00
Alex Johnston
09fab8ea7c Merge "Add factory reset protection policy Test API to DPM" into rvc-dev am: c5e9a48db8 am: 62e1784b45 
Change-Id: I6adc2da5cc238c9c220eacf61c95b0b821d46790
 2020-04-27 11:17:57 +00:00
Alex Johnston
6e33365d5e Merge "Add factory reset protection policy Test API to DPM" into rvc-dev am: c5e9a48db8 
Change-Id: Iefbf101897c96de20b8c896489ab026007a35d6a
 2020-04-27 11:06:13 +00:00
Alex Johnston
c5e9a48db8 Merge "Add factory reset protection policy Test API to DPM" into rvc-dev 2020-04-27 11:04:46 +00:00
TreeHugger Robot
311cc7a849 Merge "Add back ActivityManagerService.onUserRemoved" into rvc-dev am: 525fab26a1 am: ce289c6dbf am: f1ec3ffd73 am: 4c1da83943 
Change-Id: I0d0fea410a836f6f66d10564a86471d4c05fbaa3
 2020-04-25 01:50:06 +00:00
Darryl Johnson
ef1144a7c8 Merge "Revert "Try to reland Ib3ee007bc"" into rvc-dev am: 637fd24378 am: a76e26ed96 am: e84cf54676 am: a2a3c7431b 
Change-Id: Ic04f8b36ca7d0ee26cab6d3fc7fce5971740c7b0
 2020-04-25 01:47:22 +00:00
TreeHugger Robot
ce289c6dbf Merge "Add back ActivityManagerService.onUserRemoved" into rvc-dev am: 525fab26a1 
Change-Id: Ie3903b8778b9adf92ccc299d059bfe1fe724d870
 2020-04-25 01:19:15 +00:00
Darryl Johnson
e84cf54676 Merge "Revert "Try to reland Ib3ee007bc"" into rvc-dev am: 637fd24378 am: a76e26ed96 
Change-Id: I91387342b92c1f00ed5b6a06cbe45ee4d99b09ad
 2020-04-25 01:18:29 +00:00