Jeff Sharkey
b1a2cde4fd
Merge "Add timeout to StrictMode flash." into oc-dev
...
am: fdb3d31504
2017-06-08 00:36:09 +00:00
Yuchen He
526239e800
Fix AeModeAndLock test cases.
...
Bug: 36103813
Change-Id: Ie2e9938f6ae607f5fced5048c5ff5e41e4f7836b
(cherry picked from commit e256bc9f66
2017-06-08 00:32:43 +00:00
Jeff Sharkey
fdb3d31504
Merge "Add timeout to StrictMode flash." into oc-dev
2017-06-08 00:32:35 +00:00
Sudheer Shanka
736cb0e33a
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev
...
am: f34713066e
2017-06-08 00:15:23 +00:00
Android Build Merger (Role)
1520d813e0
Merge "Merge "Keyguard: Increase clock size" into oc-dev am: 2ff366a39a am: dacd9ed196" into oc-dr1-dev-plus-aosp
2017-06-08 00:11:05 +00:00
Ian Pedowitz
7ea4f66f35
Merge "Fixed an issue where the icons had the wrong color" into oc-dev
...
am: 695f21a661
2017-06-08 00:10:39 +00:00
Sudheer Shanka
f34713066e
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev
2017-06-08 00:08:47 +00:00
Adrian Roos
cd8210731b
Merge "Keyguard: Increase clock size" into oc-dev am: 2ff366a39a
...
am: dacd9ed196
2017-06-08 00:08:30 +00:00
Adrian Roos
fcaf2d1ae9
Merge "Keyguard: Increase clock size" into oc-dev am: 2ff366a39a
...
am: b42e50a3a0
2017-06-08 00:08:22 +00:00
Adrian Roos
b42e50a3a0
Merge "Keyguard: Increase clock size" into oc-dev
...
am: 2ff366a39a
2017-06-08 00:00:25 +00:00
Ian Pedowitz
695f21a661
Merge "Fixed an issue where the icons had the wrong color" into oc-dev
2017-06-08 00:00:20 +00:00
Adrian Roos
dacd9ed196
Merge "Keyguard: Increase clock size" into oc-dev
...
am: 2ff366a39a
2017-06-07 23:59:53 +00:00
Adrian Roos
2ff366a39a
Merge "Keyguard: Increase clock size" into oc-dev
2017-06-07 23:54:05 +00:00
Winson Chung
b69258b23d
Fix crash when deleting task
...
- There are several code paths from the loaders (which run on a background
thread) which post the call to notify an update on the task which was
loaded. Not all of these are cleared when a task is unbound, and can
result in a notifyTaskDataLoaded() after the task is unbound. For now,
just ensure that the TaskView is bound to the Task before updating.
Bug: 62194807
Test: Have not been able to repro, just ensure that recents thumbnails still
load
Change-Id: Id9301025275f4b14a2832f7f6c1ebd5a1ce124ea
2017-06-07 16:53:03 -07:00
Adrian Roos
813d6177bc
Merge "AmbientIndication: Add tap again hint" into oc-dr1-dev
...
am: 4317e457ba
2017-06-07 23:48:03 +00:00
Android Build Merger (Role)
983a3c4f5b
Merge "Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev am: f867733d4f am: cf8cfc4412" into oc-dr1-dev-plus-aosp
2017-06-07 23:43:01 +00:00
Bryce Lee
3243d73e81
Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev am: f867733d4f
...
am: cf8cfc4412
2017-06-07 23:41:57 +00:00
Android Build Merger (Role)
3b0ceaf0b1
Merge "Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev am: f867733d4f am: 50caf4af60" into oc-dr1-dev-plus-aosp
2017-06-07 23:41:55 +00:00
TreeHugger Robot
4317e457ba
Merge "AmbientIndication: Add tap again hint" into oc-dr1-dev
2017-06-07 23:40:37 +00:00
Bryce Lee
69569e269a
Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev am: f867733d4f
...
am: 50caf4af60
2017-06-07 23:40:06 +00:00
Sundeep Ghuman
1a58d16f74
Merge "Remove Wifi Badges from platform." into oc-dev am: 09d06437ad
...
am: 8d4014995d
2017-06-07 23:39:00 +00:00
Android Build Merger (Role)
f10bf2902d
Merge "Merge "Remove Wifi Badges from platform." into oc-dev am: 09d06437ad am: 216f596cee" into oc-dr1-dev-plus-aosp
2017-06-07 23:36:27 +00:00
Sundeep Ghuman
017174608a
Merge "Remove Wifi Badges from platform." into oc-dev am: 09d06437ad
...
am: 216f596cee
2017-06-07 23:35:32 +00:00
Android Build Merger (Role)
e21b705f13
Merge "Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev am: 584406f8e1 -s ours am: 788b2b9364 -s ours" into oc-dr1-dev-plus-aosp
2017-06-07 23:35:15 +00:00
Bryce Lee
cf8cfc4412
Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev
...
am: f867733d4f
2017-06-07 23:33:43 +00:00
Sundeep Ghuman
c633a31fda
Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev am: 584406f8e1
...
am: 8695bda38e
2017-06-07 23:31:52 +00:00
Sundeep Ghuman
e1f1d19841
Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev am: 584406f8e1 -s ours
...
am: 788b2b9364
2017-06-07 23:31:49 +00:00
Bryce Lee
50caf4af60
Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev
...
am: f867733d4f
2017-06-07 23:31:48 +00:00
Sundeep Ghuman
8d4014995d
Merge "Remove Wifi Badges from platform." into oc-dev
...
am: 09d06437ad
2017-06-07 23:28:29 +00:00
Sundeep Ghuman
8695bda38e
Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev
...
am: 584406f8e1
2017-06-07 23:25:57 +00:00
Sundeep Ghuman
216f596cee
Merge "Remove Wifi Badges from platform." into oc-dev
...
am: 09d06437ad
2017-06-07 23:25:50 +00:00
Bryce Lee
f867733d4f
Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev
2017-06-07 23:23:30 +00:00
Sundeep Ghuman
788b2b9364
Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev
...
am: 584406f8e1
2017-06-07 23:23:20 +00:00
TreeHugger Robot
09d06437ad
Merge "Remove Wifi Badges from platform." into oc-dev
2017-06-07 23:19:09 +00:00
TreeHugger Robot
584406f8e1
Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev
2017-06-07 23:18:11 +00:00
Selim Cinek
383cc53049
Merge "Fixed an issue where the qs panel wasn't properly placed" into oc-dr1-dev
...
am: ab67c300f3
2017-06-07 23:09:37 +00:00
Bryce Lee
46b01655b3
Revert "Coordinate configuration changes and window frame size."
...
This reverts commit afb45bba83
2017-06-07 23:03:09 +00:00
Selim Cinek
ab67c300f3
Merge "Fixed an issue where the qs panel wasn't properly placed" into oc-dr1-dev
2017-06-07 22:57:58 +00:00
Todd Kennedy
18211fd8f6
Passing callingUid to internal methods
...
Sometimes callers want to clear the calling identity [to avoid permission
calls]. In this case, allow passing the original calling identity to
internal methods.
Test: Manual; create profile account and observe launcher still works cross profile
Test: bit FrameworksServicesTests:com.android.server.pm.ShortcutManagerTest{1..10}
Change-Id: I73f8ad4b2dc1895227c3fcb14f3f1f18f600562f
Fixes: 38349978
2017-06-07 15:53:21 -07:00
Selim Cinek
a7c69637f8
Fixed an issue where the icons had the wrong color
...
The color of the icons was taken from the ambient view
and wasn't updated when dark changed.
Change-Id: I472e76ff9d4d92500faae5517f10bdeb2658936d
Fixes: 62423352
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/ExpandableNotificationRowTest.java
2017-06-07 15:52:30 -07:00
Sanket Padawe
2fe6328048
Merge "Update strings for modem restricted state." into oc-dev am: 58977d1035
...
am: 6ef238a51c
2017-06-07 22:08:26 +00:00
Sanket Padawe
4170c83598
Merge "Update strings for modem restricted state." into oc-dev am: 58977d1035
...
am: 6acd6102c9
2017-06-07 22:01:52 +00:00
Android Build Merger (Role)
46ee248162
Merge "Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev am: fc1753d495 am: 52e73d8ffb" into oc-dr1-dev-plus-aosp
2017-06-07 21:58:52 +00:00
Jorim Jaggi
55a6482bc1
Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev am: fc1753d495
...
am: 52e73d8ffb
2017-06-07 21:57:52 +00:00
Jorim Jaggi
0a94cc6eb0
Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev am: fc1753d495
...
am: 59fe02cf95
2017-06-07 21:56:25 +00:00
Sanket Padawe
6acd6102c9
Merge "Update strings for modem restricted state." into oc-dev
...
am: 58977d1035
2017-06-07 21:53:44 +00:00
Sanket Padawe
6ef238a51c
Merge "Update strings for modem restricted state." into oc-dev
...
am: 58977d1035
2017-06-07 21:50:30 +00:00
Jorim Jaggi
59fe02cf95
Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev
...
am: fc1753d495
2017-06-07 21:47:03 +00:00
Jorim Jaggi
52e73d8ffb
Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev
...
am: fc1753d495
2017-06-07 21:46:41 +00:00
Todd Kennedy
96a7326d90
expand who can uninstall an instant app
...
More than just those with the ACCESS_INSTANT_APP
permission should be able to uninstall instant apps.
Any uid that can see instant apps [that includes
the shell and some others] should be able to
uninstall them.
Change-Id: Iea24e5a1cdb369bdf29e7cf5db7977db63faedfc
Fixes: 62406346
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
2017-06-07 14:46:02 -07:00
