drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
315,875 Commits 1 Branch 0 Tags
Commit Graph

29174 Commits

Author SHA1 Message Date
Jorim Jaggi
b595d2a08c Merge "Don't consider app as top app if alpha = 0" into oc-dev am: 4a2be133d4 
am: 054a99d029

Change-Id: I00fa7330cb0f5452c1d1c11323cf13981c3355fb
 2017-04-14 17:01:19 +00:00
Jean-Michel Trivi
dc36701751 Merge "Fix A11y volume persisting/restore" into oc-dev am: 076a0bd0bf 
am: 350b39fbc8

Change-Id: I376101c1e68cdab01cdf3ee0db3bbe64b4bcd631
 2017-04-14 16:16:46 +00:00
Dongwon Kang
08b24d1507 Merge "TIF: add helper methods for making a channel browsable." into oc-dev am: b2eb818a7d 
am: 3d9ecc264d

Change-Id: I321131835e44d67bb5fab085bc7f36a838dd40e3
 2017-04-14 16:12:49 +00:00
Bryce Lee
5aa7e073bc Merge "Remove window container from empty task when destroying." into oc-dev am: 61bce9ab13 
am: a27128b8c7

Change-Id: Iadbae988357788bb50bbaebd7e4a580aaefb4308
 2017-04-14 16:06:48 +00:00
Adam Lesinski
c96e4b0f76 Merge "BatteryStats: Remove reading of cpu power" into oc-dev am: af85d84050 
am: 51d94c82af

Change-Id: I0bef2f7074a06f8336d727dd89c685c76262eca5
 2017-04-14 16:04:32 +00:00
Dianne Hackborn
cc04f02b44 Merge "Add new facility to find out when a PendingIntent is canceled." into oc-dev am: 29c70437b3 
am: 76c71a01e2

Change-Id: Ieafe036ee6c2662d5897a8052facd3cd0d9fbed7
 2017-04-14 16:01:58 +00:00
Geoffrey Pitsch
e1a00e34db Merge "Ensure removeForegroundService checks both lists under lock" into oc-dev am: c4ca1b5677 
am: aa8dcf3751

Change-Id: Ic9780a11f1c3d3bbcbd8c5be350176507c62c685
 2017-04-14 15:58:22 +00:00
Todd Kennedy
5fb012e45d Merge "Filter instant app content providers" into oc-dev am: 3891674204 
am: 0bb486bcb4

Change-Id: If96297cade9909d744eb57669aecd96841a27a31
 2017-04-14 15:42:02 +00:00
Chris Tate
d593e402c2 Merge "Introduce PACKAGE_FIRST_ADDED broadcast" into oc-dev am: 117ac766a9 
am: 636915a2ed

Change-Id: I28d8d31b30c9b500be1796566bb9885741b9aedc
 2017-04-14 15:34:16 +00:00
TreeHugger Robot
f9993a7b44 Merge "Add EXTRA_WIPE_ESIMS for factory reset of eSIM" 2017-04-14 02:04:01 +00:00
TreeHugger Robot
c8e5987286 Merge "Implement new splash screen API" 2017-04-14 01:44:36 +00:00
Jorim Jaggi
054a99d029 Merge "Don't consider app as top app if alpha = 0" into oc-dev 
am: 4a2be133d4

Change-Id: Ibd7f89a49154bbf0bf89a5baa301e7912cf8db89
 2017-04-14 01:14:18 +00:00
TreeHugger Robot
4a2be133d4 Merge "Don't consider app as top app if alpha = 0" into oc-dev 2017-04-14 01:06:52 +00:00
Jorim Jaggi
4b84606c21 Implement new splash screen API 
Test: mmm frameworks/base/tests/ActivityTests, launch
CustomSplashscreenActivity
Test: android.server.android.server.cts.SplashscreenTests

Bug: 37252694
Change-Id: I9a5bc19b8f63312e682e536500411e4ff4639f88
 2017-04-13 16:39:44 -07:00
Andreas Huber
28b0c4b88c Merge "Changed the naming scheme for Treble java libraries (both static and dynamic)" 2017-04-13 23:27:32 +00:00
qingxi
240c2bb621 Add EXTRA_WIPE_ESIMS for factory reset of eSIM 
EXTRA_WIPE_ESIMS will be set as true when the user chooses to wip eSIM
information during factory reset. This will be handled by
MasterClearReceiver.

Bug: 37255419
Test: Test on phone
Change-Id: Ic2e4a6af8f9a9f3854f33eb9eeaf9b052e47e1b6
 2017-04-13 16:26:06 -07:00
Jean-Michel Trivi
350b39fbc8 Merge "Fix A11y volume persisting/restore" into oc-dev 
am: 076a0bd0bf

Change-Id: Ida09a7781114812adbb4536fac53a3773cd69dc4
 2017-04-13 21:40:36 +00:00
Dongwon Kang
3d9ecc264d Merge "TIF: add helper methods for making a channel browsable." into oc-dev 
am: b2eb818a7d

Change-Id: I54b92c8b773706de49ffd2e78df59568e19d3b49
 2017-04-13 21:32:15 +00:00
Jean-Michel Trivi
076a0bd0bf Merge "Fix A11y volume persisting/restore" into oc-dev 2017-04-13 21:32:06 +00:00
Andreas Huber
4baa03b3c0 Changed the naming scheme for Treble java libraries (both static and dynamic) 
android.hardware.foo@1.0-java => android.hardware.foo-V1.0-java

Bug: 37207894
Test: make
Change-Id: I2d8912dc752f904188457c3e6dac10da1afd287a
 2017-04-13 14:27:10 -07:00
TreeHugger Robot
b2eb818a7d Merge "TIF: add helper methods for making a channel browsable." into oc-dev 2017-04-13 21:23:48 +00:00
Mike Tsao
9c1a13271e Merge "Add tests for ag/2086796" 2017-04-13 21:16:31 +00:00
Bryce Lee
a27128b8c7 Merge "Remove window container from empty task when destroying." into oc-dev 
am: 61bce9ab13

Change-Id: If4544085864f9fe40de4d2dd44ad4a880f79c43a
 2017-04-13 20:33:19 +00:00
Adam Lesinski
51d94c82af Merge "BatteryStats: Remove reading of cpu power" into oc-dev 
am: af85d84050

Change-Id: I671a51d53c035d40cb1af1428f7c0f4093445aed
 2017-04-13 20:22:19 +00:00
Dianne Hackborn
76c71a01e2 Merge "Add new facility to find out when a PendingIntent is canceled." into oc-dev 
am: 29c70437b3

Change-Id: I5078d76e3eb861850ef7af769badf81dbdee418a
 2017-04-13 20:15:05 +00:00
Bryce Lee
61bce9ab13 Merge "Remove window container from empty task when destroying." into oc-dev 2017-04-13 20:10:56 +00:00
Geoffrey Pitsch
aa8dcf3751 Merge "Ensure removeForegroundService checks both lists under lock" into oc-dev 
am: c4ca1b5677

Change-Id: I81a50649ba59d28fdfc9a7b8381bcaf346555a3a
 2017-04-13 20:10:13 +00:00
Adam Lesinski
af85d84050 Merge "BatteryStats: Remove reading of cpu power" into oc-dev 2017-04-13 20:09:51 +00:00
TreeHugger Robot
29c70437b3 Merge "Add new facility to find out when a PendingIntent is canceled." into oc-dev 2017-04-13 20:01:32 +00:00
Todd Kennedy
0bb486bcb4 Merge "Filter instant app content providers" into oc-dev 
am: 3891674204

Change-Id: I4e33d8e82a249249dfe25964cbfdb89b2f1e0318
 2017-04-13 19:59:28 +00:00
TreeHugger Robot
c4ca1b5677 Merge "Ensure removeForegroundService checks both lists under lock" into oc-dev 2017-04-13 19:50:00 +00:00
Chris Tate
636915a2ed Merge "Introduce PACKAGE_FIRST_ADDED broadcast" into oc-dev 
am: 117ac766a9

Change-Id: I9bec0f90873a5bcb9ff89eadcf7e334e9f0afb89
 2017-04-13 19:45:30 +00:00
TreeHugger Robot
3891674204 Merge "Filter instant app content providers" into oc-dev 2017-04-13 19:43:31 +00:00
Chris Tate
117ac766a9 Merge "Introduce PACKAGE_FIRST_ADDED broadcast" into oc-dev 2017-04-13 19:24:13 +00:00
Jean-Michel Trivi
a53b7051a2 Fix A11y volume persisting/restore 
When the accessibility volume is enabled, its value wasn't persisted
  when changed because it was still using the persisting name from
  its alias (music).
When enabled, notiify the volume controller that a11y volume has
  changed so the UI also reflects the new value, now updated from
  the persisted settings.
Do not persist volumes for streams that don't have a setting name.

Test: enable Talkback, set a11y volume at a different level than media \
  then disable Talkback. Reboot and enable Talkback, verify a11y is \
  restored.
Bug: 36286073

Change-Id: Ic6c30364e164b856fc10fbf6b22c09a7b5561be1
 2017-04-13 12:04:15 -07:00
Dianne Hackborn
f66adfd1cd Add new facility to find out when a PendingIntent is canceled. 
This is just an internal API in the platform, not (yet?) available
in the SDK.  But it will be useful for system services that want to
clean up state if a pending intent that has been registered with them
is canceled (either explicitly by the app, through the app being
uninstalled, etc).

Also improve the activity manager's dump of pending intents to
organize them by package, making it much easier to read (now that
we have so many active pending intents these days).

Test: ran and booted.  no CTS, since no API.

Change-Id: Iad029cfedcd77e87357eca7da1b6ae94451dd981
 2017-04-13 11:04:30 -07:00
Mike Tsao
cfe4ffecce Add tests for ag/2086796 
Fixes: 37192695
Change-Id: Id0b3cbf986490d64cdc5592541dee1b004853503
Test: added
 2017-04-13 11:01:31 -07:00
Jeremy Joslin
101c773b81 Merge "Always call unbind." into oc-dev am: f726b4aa9a 
am: 3a74fcedad

Change-Id: I7c60a76c4ce352e76042c89841f917f3f97e078a
 2017-04-13 17:59:03 +00:00
Geoffrey Pitsch
87237d70a5 Ensure removeForegroundService checks both lists under lock 
Prior CL didn't lock properly and would still fail if a
notification was both enqueued and posted at the same time.

Test: runtest systemui-notification
Change-Id: I1bdd779ecb872f1a02ffc38b6007239eb522b521
Fixes: 36550043
 2017-04-13 13:44:09 -04:00
Jeremy Joslin
3a74fcedad Merge "Always call unbind." into oc-dev 
am: f726b4aa9a

Change-Id: If6fafdd633bb3c9120f00818de5f97ae2cfd7735
 2017-04-13 17:41:06 +00:00
Julia Reynolds
ed5a121516 Merge "Allow notification channels to be silent." into oc-dev am: d178ec489f 
am: 41de81ea75

Change-Id: Ie1d34910cdbd1d534296dd848baa3af8b181357a
 2017-04-13 17:40:55 +00:00
TreeHugger Robot
f726b4aa9a Merge "Always call unbind." into oc-dev 2017-04-13 17:28:52 +00:00
Julia Reynolds
41de81ea75 Merge "Allow notification channels to be silent." into oc-dev 
am: d178ec489f

Change-Id: I9e016e2523b9da200c26df2ddce642942bc0b806
 2017-04-13 17:23:39 +00:00
Bryce Lee
840c566d13 Remove window container from empty task when destroying. 
Previously, the window container was being removed whenever we were
removing the task in a destroy mode. However, this caused issues
where an activity may still be present in the task record, leading to
a subequent change to limit this to tasks with overlays. This led to
the situation where the window container would not be destroyed when
it was supposed to, such as moving an activity to recents, but
otherwise destroying.

This changelist addresses the issue by always removing the window
container from tasks when removed from their parent stack in a
destroy mode and empty. In the recents flow, this will fire and
cleanup when the activity is destroyed.

Change-Id: I87548d6ff8e4d77b6294504d7cc78370cd5d31fa
Fixes: 37301159
Test: bit FrameworksServicesTests:com.android.server.am.ActivityStackTests
 2017-04-13 10:16:59 -07:00
Julia Reynolds
94d7dba7f2 Merge "Companion device mgr doesn't always exist" into oc-dev am: 3d6225b4e2 
am: a98a3444fb

Change-Id: I4d540fadf69842a45fc86f08f8fc3f10cab5a0c7
 2017-04-13 17:12:16 +00:00
Julia Reynolds
d178ec489f Merge "Allow notification channels to be silent." into oc-dev 2017-04-13 17:07:46 +00:00
Julia Reynolds
a98a3444fb Merge "Companion device mgr doesn't always exist" into oc-dev 
am: 3d6225b4e2

Change-Id: I10420e5cf8fdb6359c8191d0626cd71ecab395aa
 2017-04-13 17:01:26 +00:00
TreeHugger Robot
3d6225b4e2 Merge "Companion device mgr doesn't always exist" into oc-dev 2017-04-13 16:50:50 +00:00
Winson Chung
51ddd5d677 Merge "Fix issue with non-focusable PiP activities being resumed." into oc-dev am: 68cf1b8848 
am: 8561894fa9

Change-Id: Ib006ed2cb24e7b206a5cce0891f1dbd0476d7cde
 2017-04-13 16:25:30 +00:00
Winson Chung
8561894fa9 Merge "Fix issue with non-focusable PiP activities being resumed." into oc-dev 
am: 68cf1b8848

Change-Id: I7d20aeebb7e1a1e6485cc22a8e18ca3c4ab35c3d
 2017-04-13 16:13:30 +00:00