Adam Vartanian
3120b33204
DO NOT MERGE Remove createSocket(Socket, InputStream, boolean) from APIs.
...
This method wasn't intended to be new API for DR1.
Bug: 62428936
Test: make
Change-Id: I5c0d523d0f61ab544cd987fa92daefcc79fc0732
2017-06-09 12:25:36 +00:00
Felipe Leme
4d579eacec
Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev
...
am: 9be8c96918
2017-06-08 06:07:15 +00:00
Mark Rathjen
d88c71a6e2
Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev
...
am: 3492ed4376
2017-06-08 06:04:54 +00:00
Yuchen He
43f1ee3ac8
Merge "Fix AeModeAndLock test cases. Bug: 36103813" into oc-dev
...
am: 3671e9249b
2017-06-08 06:01:50 +00:00
Adam Bookatz
0fcadeaeb9
Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev
...
am: 6029bce3b4
2017-06-08 05:59:56 +00:00
Todd Kennedy
23e5a1ee65
Merge changes Iea24e5a1,If71385bc into oc-dev
...
am: 3834421c96
2017-06-08 05:54:33 +00:00
Phil Weaver
7c44479edf
Merge "Confirm a11y shortcut service for correct user" into oc-dev
...
am: 03a5b3a509
2017-06-08 05:52:11 +00:00
Todd Kennedy
de066fd249
Merge "Passing callingUid to internal methods" into oc-dev
...
am: dacdf2e978
2017-06-08 05:50:03 +00:00
Jeff Sharkey
13e4dfdceb
Merge "Add timeout to StrictMode flash." into oc-dev
...
am: fdb3d31504
2017-06-08 05:47:38 +00:00
Sudheer Shanka
2bb4966dab
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev
...
am: f34713066e
2017-06-08 05:44:49 +00:00
Ian Pedowitz
be261948cb
Merge "resolve merge conflicts of 695f21a661 to oc-dr1-dev" into oc-dr1-dev
2017-06-08 05:42:18 +00:00
Etan Cohen
89d6859dc4
Merge "[AWARE] Add validity check on PMK/Passphrase lengths" into oc-dr1-dev
2017-06-08 05:26:21 +00:00
Felipe Leme
9be8c96918
Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev
2017-06-08 05:21:08 +00:00
Mark Rathjen
3492ed4376
Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev
2017-06-08 04:44:07 +00:00
Kevin Chyn
4fddc9fa4d
Add setting and permission for assist gesture
...
Bug: 37427306
Test: manual
Merged-In: I659fa43fb085575df4d62e7765d88c6fd615fb7d
Change-Id: I659fa43fb085575df4d62e7765d88c6fd615fb7d
2017-06-07 21:42:55 -07:00
Yuchen He
3671e9249b
Merge "Fix AeModeAndLock test cases. Bug: 36103813" into oc-dev
2017-06-08 04:32:36 +00:00
Ian Pedowitz
a27856d443
resolve merge conflicts of 695f21a661 to oc-dr1-dev
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ifeffa55c7fb80b0f327ecc5b50cefeca9db6457b
Merged-In: I558447f282bb54f13be1622c3f2528a383fbc3b7
2017-06-07 19:52:10 -07:00
Adam Bookatz
6029bce3b4
Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev
2017-06-08 02:43:20 +00:00
TreeHugger Robot
3834421c96
Merge changes Iea24e5a1,If71385bc into oc-dev
...
* changes:
expand who can uninstall an instant app
Final changes to protect the API surface
2017-06-08 01:40:07 +00:00
Phil Weaver
03a5b3a509
Merge "Confirm a11y shortcut service for correct user" into oc-dev
2017-06-08 01:37:48 +00:00
TreeHugger Robot
dacdf2e978
Merge "Passing callingUid to internal methods" into oc-dev
2017-06-08 01:00:52 +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
f34713066e
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev
2017-06-08 00:08:47 +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
TreeHugger Robot
4317e457ba
Merge "AmbientIndication: Add tap again hint" into oc-dr1-dev
2017-06-07 23:40:37 +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
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
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
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
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
TreeHugger Robot
58977d1035
Merge "Update strings for modem restricted state." into oc-dev
2017-06-07 21:42:37 +00:00
TreeHugger Robot
fc1753d495
Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev
2017-06-07 21:40:04 +00:00
Selim Cinek
334964899f
Merge "Fixed a flicker of group notifications" into oc-dev
...
am: beba1bf936
2017-06-07 21:03:12 +00:00
Winson Chung
f676ac8ce5
Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev
...
am: fd6b3c6da3
2017-06-07 20:57:41 +00:00
Selim Cinek
beba1bf936
Merge "Fixed a flicker of group notifications" into oc-dev
2017-06-07 20:47:52 +00:00
TreeHugger Robot
fd6b3c6da3
Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev
2017-06-07 20:46:20 +00:00
Jian Sun
da93f30457
Merge "Notify registered packages of visible accounts change when authenticators get uninstalled." into oc-dev
...
am: 8d5b58a660
2017-06-07 20:37:45 +00:00
Jeff Sharkey
65ac7619f9
Add timeout to StrictMode flash.
...
Consider an app that requests that a StrictMode border be shown, and
then immediately crashes. We'd end up showing the bars indefinitely,
which is a terrible UX.
This CL enqueues a second message to tear down the bars if nobody
asks for them to be taken down within 1 second.
Test: manual app that crashed after showing violation bars
Bug: 37787765
Change-Id: I45d2078d0dcaa94e8f24087d028f5f06d12c4349
2017-06-07 14:36:03 -06:00
Adrian Roos
dea3c986bc
Keyguard: Increase clock size
...
Test: observe that keyguard clock looks slightly bigger now
Change-Id: Ic55582abb1cf82bf104afce7d1271e456c78aa1b
Fixes: 62105028
2017-06-07 20:34:08 +00:00
