OSDN Git Service
Jakub Pawlowski [Thu, 8 Jun 2017 21:20:27 +0000 (21:20 +0000)]
Merge "Bluetooth: fix connectGatt overload invocations" am:
404e9f209f
am:
c0fed83b84
Change-Id: I871bc30dcd7aeb5c4a6f6c15d84b43dee84994f2
Jakub Pawlowski [Thu, 8 Jun 2017 21:12:26 +0000 (21:12 +0000)]
Merge "Bluetooth: fix connectGatt overload invocations"
am:
404e9f209f
Change-Id: I01699795f733fbf46af10ba25afd8cb3feecc9ea
Jakub Pawlowski [Thu, 8 Jun 2017 20:59:33 +0000 (20:59 +0000)]
Merge "Bluetooth: fix connectGatt overload invocations"
Tyler Gunn [Thu, 8 Jun 2017 20:15:58 +0000 (20:15 +0000)]
Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev
am:
980582e555
Change-Id: I50666f5d3c4e224221a07a170598a5ea25d5f5ef
Tyler Gunn [Thu, 8 Jun 2017 20:06:52 +0000 (20:06 +0000)]
Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev
Daichi Hirono [Thu, 8 Jun 2017 18:30:15 +0000 (18:30 +0000)]
Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev
am:
ebb6e998d5
Change-Id: I8973b62b103f4f40275bc5681f54b5957385ecb1
TreeHugger Robot [Thu, 8 Jun 2017 18:25:24 +0000 (18:25 +0000)]
Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev
Jakub Pawlowski [Wed, 7 Jun 2017 20:45:33 +0000 (13:45 -0700)]
Bluetooth: fix connectGatt overload invocations
Test: sl4a GattOverBrEdrTest
Bug:
62387078
Change-Id: I5bfb87683e25f8862587e8000eb4c9bb6ff14f99
Mady Mellor [Thu, 8 Jun 2017 17:46:14 +0000 (17:46 +0000)]
Merge "Ensure the menu items are properly recreated after a density change" into oc-dev
am:
f574869c11
Change-Id: I9794ac492099f5a359a25652a49e94ef933e4e0c
Winson Chung [Thu, 8 Jun 2017 17:43:12 +0000 (17:43 +0000)]
Merge "Fix crash when deleting task" into oc-dev
am:
c6fa8ee018
Change-Id: Icb2d14ee8f7d5646e248aa010bcf731b6f1ff60f
TreeHugger Robot [Thu, 8 Jun 2017 17:39:37 +0000 (17:39 +0000)]
Merge "Ensure the menu items are properly recreated after a density change" into oc-dev
Winson Chung [Thu, 8 Jun 2017 17:37:53 +0000 (17:37 +0000)]
Merge "Fix crash when deleting task" into oc-dev
Jason Monk [Thu, 8 Jun 2017 16:41:05 +0000 (16:41 +0000)]
Merge "Move QS cell indicator back into mobile data tile" into oc-dev
am:
a5b457b3bf
Change-Id: I09bcb45a8931b8fedae967b1d88ab594164a9dc7
Jason Monk [Thu, 8 Jun 2017 16:35:21 +0000 (16:35 +0000)]
Merge "Move QS cell indicator back into mobile data tile" into oc-dev
Svetoslav Ganov [Thu, 8 Jun 2017 16:04:17 +0000 (16:04 +0000)]
Merge "Ensure only test print services enabled - framework" into oc-dev
am:
053fb9120e
Change-Id: I70220ead15eabfe58727ab5c3b0a9c92e8c508a8
Jesse Hall [Thu, 8 Jun 2017 15:56:17 +0000 (15:56 +0000)]
Merge "Allow disabling GL preload even if gfxdriver isn't updatable" am:
9cf8c281d2
am:
00c6c3be77
Change-Id: I15b4288df07fe2f1fb5d0b4f6404708c116149ff
TreeHugger Robot [Thu, 8 Jun 2017 15:55:05 +0000 (15:55 +0000)]
Merge "Ensure only test print services enabled - framework" into oc-dev
Jesse Hall [Thu, 8 Jun 2017 15:41:46 +0000 (15:41 +0000)]
Merge "Allow disabling GL preload even if gfxdriver isn't updatable"
am:
9cf8c281d2
Change-Id: I025787589009c11bd5477777105b2a5ab2c5f592
Jesse Hall [Thu, 8 Jun 2017 15:34:42 +0000 (15:34 +0000)]
Merge "Allow disabling GL preload even if gfxdriver isn't updatable"
Andrei Stingaceanu [Thu, 8 Jun 2017 14:44:55 +0000 (14:44 +0000)]
Merge "Fix unexpected DatePicker validation" into oc-dev
am:
cd603221e1
Change-Id: Id06c3a8d76954f40c99673db034342c9023cc408
Wale Ogunwale [Thu, 8 Jun 2017 14:41:31 +0000 (14:41 +0000)]
Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev
am:
13059cc2ad
Change-Id: Iccf433dd506f42ae07531fe9cd0fa239882d4cf2
TreeHugger Robot [Thu, 8 Jun 2017 14:36:07 +0000 (14:36 +0000)]
Merge "Fix unexpected DatePicker validation" into oc-dev
Wale Ogunwale [Thu, 8 Jun 2017 14:33:03 +0000 (14:33 +0000)]
Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev
Selim Cinek [Thu, 8 Jun 2017 14:15:33 +0000 (14:15 +0000)]
Merge "Fixed a bug where the navigation notification would flicker" into oc-dev
am:
b18f65a168
Change-Id: I53abb4f31f8dc660ba9b140475bbd121df524613
Selim Cinek [Thu, 8 Jun 2017 14:07:14 +0000 (14:07 +0000)]
Merge "Fixed a bug where the navigation notification would flicker" into oc-dev
Erik Kline [Thu, 8 Jun 2017 13:32:53 +0000 (13:32 +0000)]
Delete legacy "wifi interface name guessing" behaviour
am:
9e22554068
Change-Id: I25e3814f979dbe65055498c85b34411cf6d3c996
Erik Kline [Thu, 8 Jun 2017 12:20:31 +0000 (12:20 +0000)]
Merge "Move findPreferredUpstreamType into UNM" am:
32703994fe
am:
8bc87070f9
Change-Id: Ia215e55b69b856f5511e5d4f852e39fa6c11462e
Erik Kline [Thu, 8 Jun 2017 12:11:59 +0000 (12:11 +0000)]
Merge "Move findPreferredUpstreamType into UNM"
am:
32703994fe
Change-Id: I20e90906e72bc8bba9f0f535d54ba430f96191ff
Treehugger Robot [Thu, 8 Jun 2017 12:02:59 +0000 (12:02 +0000)]
Merge "Move findPreferredUpstreamType into UNM"
Erik Kline [Thu, 8 Jun 2017 08:48:48 +0000 (17:48 +0900)]
Delete legacy "wifi interface name guessing" behaviour
Now that Wi-Fi always passes us the AP interface name (and mode)
we no longer need to guess which interface on which we're supposed
to be starting IP serving (either tethering or local-only hotspot).
Test: as follows
- built
- flashed
- booted
- TetheringTest passes
Bug:
32163131
Bug:
62343300
Change-Id: I6019410ee5adff4929690d35ba09294765fcd6a4
Erik Kline [Mon, 5 Jun 2017 07:02:02 +0000 (16:02 +0900)]
Move findPreferredUpstreamType into UNM
This changes the way in which available networks are found. Previously
Tethering asked ConnectivityService for NetworkInfo and checked for
whether or not it was in state CONNECTED.
Here we use the fact that ConnectivityService will not call UNM's
callbacks' onAvailable() methods until the networks in question have
become connected.
Test: as follows
- built
- flashed
- booted
- runtest framework-net passed
Bug:
32163131
Change-Id: I97abe225fdd3accb38bd9168f545445b761a90d8
Felipe Leme [Thu, 8 Jun 2017 05:25:17 +0000 (05:25 +0000)]
Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev
am:
9be8c96918
Change-Id: I5cb2eb64772ea9f3fc189f629be0ddcd29fbe4d9
Felipe Leme [Thu, 8 Jun 2017 05:21:02 +0000 (05:21 +0000)]
Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev
Mark Rathjen [Thu, 8 Jun 2017 04:50:16 +0000 (04:50 +0000)]
Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev
am:
3492ed4376
Change-Id: I424396abf3e403abd1eec8a529b0b322019b7a01
Mark Rathjen [Thu, 8 Jun 2017 04:43:56 +0000 (04:43 +0000)]
Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev
Yuchen He [Thu, 8 Jun 2017 04:38:16 +0000 (04:38 +0000)]
Merge "Fix AeModeAndLock test cases. Bug:
36103813" into oc-dev
am:
3671e9249b
Change-Id: I2ebc01dc54f654d60e03696490c681a656a7b958
Yuchen He [Thu, 8 Jun 2017 04:32:31 +0000 (04:32 +0000)]
Merge "Fix AeModeAndLock test cases. Bug:
36103813" into oc-dev
Andreas Gampe [Thu, 8 Jun 2017 03:22:23 +0000 (03:22 +0000)]
Merge "Framework: Remove SamplingProfiler" am:
d2ecee2506
am:
3ea0309e39 -s ours
Change-Id: I41f6a58ee13d3b07298d41d9dfea330e91547b9b
Andreas Gampe [Thu, 8 Jun 2017 03:16:54 +0000 (03:16 +0000)]
Merge "Framework: Remove SamplingProfiler"
am:
d2ecee2506
Change-Id: Iccba75c67041593131bec64e518a1bd968cb1bb0
Treehugger Robot [Thu, 8 Jun 2017 03:05:57 +0000 (03:05 +0000)]
Merge "Framework: Remove SamplingProfiler"
Adam Bookatz [Thu, 8 Jun 2017 02:48:32 +0000 (02:48 +0000)]
Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev
am:
6029bce3b4
Change-Id: I67da5b543fc839031d3d2544f3723b730edaa1a8
Adam Bookatz [Thu, 8 Jun 2017 02:43:14 +0000 (02:43 +0000)]
Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev
Svetoslav Ganov [Thu, 8 Jun 2017 01:50:02 +0000 (18:50 -0700)]
Ensure only test print services enabled - framework
Test: cts-tradefed run cts-dev -m CtsPrintTestCas
bug:
62232727
Change-Id: I1050272586d1c03dc1b1dfdb8b10e258912a249b
Todd Kennedy [Thu, 8 Jun 2017 01:49:03 +0000 (01:49 +0000)]
Merge changes Iea24e5a1,If71385bc into oc-dev
am:
3834421c96
Change-Id: I6ed4a41dbd9af3a97b774e7d2854fea1c66cc582
Phil Weaver [Thu, 8 Jun 2017 01:45:56 +0000 (01:45 +0000)]
Merge "Confirm a11y shortcut service for correct user" into oc-dev
am:
03a5b3a509
Change-Id: I99dbc13b0456e05f42d47b887e999931658f101d
TreeHugger Robot [Thu, 8 Jun 2017 01:40:03 +0000 (01:40 +0000)]
Merge changes Iea24e5a1,If71385bc into oc-dev
* changes:
expand who can uninstall an instant app
Final changes to protect the API surface
Phil Weaver [Thu, 8 Jun 2017 01:37:43 +0000 (01:37 +0000)]
Merge "Confirm a11y shortcut service for correct user" into oc-dev
Hall Liu [Thu, 8 Jun 2017 01:32:43 +0000 (01:32 +0000)]
Merge "Embms download setup" am:
da5b77fa9b
am:
a807ee8f1c
Change-Id: I6a78b3873814283d768c7e9a642b882bef8b11fc
Hall Liu [Thu, 8 Jun 2017 01:26:28 +0000 (01:26 +0000)]
Merge "Embms download setup"
am:
da5b77fa9b
Change-Id: I18b378fd0c999e40e3dc8cf9d1248414489880c6
Hall Liu [Thu, 8 Jun 2017 01:20:48 +0000 (01:20 +0000)]
Merge "Embms download setup"
Daichi Hirono [Thu, 18 May 2017 03:54:25 +0000 (12:54 +0900)]
Fix NPE in MtpDocumentsProviderTests
Previous patch ag/
2250238 broke MtpDocumentsProviderTests since
ServiceIntentSender's constructor refers the context argument which is
null in the tests.
The CL adds a test version of the constructor which does not use the
context argument in it.
Bug:
38363487
Test: MtpDocumentsProviderTests
Change-Id: I68a1d8cb6997499e5069c33f70fd0f675aaad77c
(cherry picked from commit
c5949bd39c788e98edd9862c7ac12e822a906ad5)
TreeHugger Robot [Thu, 8 Jun 2017 01:08:20 +0000 (01:08 +0000)]
Merge "Framework: Remove SamplingProfiler" into oc-dev-plus-aosp
Todd Kennedy [Thu, 8 Jun 2017 01:05:25 +0000 (01:05 +0000)]
Merge "Passing callingUid to internal methods" into oc-dev
am:
dacdf2e978
Change-Id: I11bcd48eb91c1f877a27f1cb06d6269aef76d3d2
Selim Cinek [Tue, 6 Jun 2017 00:50:19 +0000 (17:50 -0700)]
Fixed a bug where the navigation notification would flicker
Change-Id: Id68ba339407287d67d8db888515389e79e09ece3
Fixes:
62339936
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationCustomViewWrapperTest.java
TreeHugger Robot [Thu, 8 Jun 2017 01:00:47 +0000 (01:00 +0000)]
Merge "Passing callingUid to internal methods" into oc-dev
Jeff Sharkey [Thu, 8 Jun 2017 00:36:09 +0000 (00:36 +0000)]
Merge "Add timeout to StrictMode flash." into oc-dev
am:
fdb3d31504
Change-Id: I13684a6c952e978eed035e8c217605469c3b8665
Yuchen He [Fri, 12 May 2017 01:49:22 +0000 (18:49 -0700)]
Fix AeModeAndLock test cases.
Bug:
36103813
Change-Id: Ie2e9938f6ae607f5fced5048c5ff5e41e4f7836b
(cherry picked from commit
e256bc9f66c6812f02326432ed22f7adca47cc9c)
Jeff Sharkey [Thu, 8 Jun 2017 00:32:30 +0000 (00:32 +0000)]
Merge "Add timeout to StrictMode flash." into oc-dev
Sudheer Shanka [Thu, 8 Jun 2017 00:15:23 +0000 (00:15 +0000)]
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev
am:
f34713066e
Change-Id: I7ba4faeae53df155de0a25347efcc15974f2cc8c
Ian Pedowitz [Thu, 8 Jun 2017 00:10:39 +0000 (00:10 +0000)]
Merge "Fixed an issue where the icons had the wrong color" into oc-dev
am:
695f21a661
Change-Id: Id515004fae2e8ad90346ce82b334ae6f61b2c086
Sudheer Shanka [Thu, 8 Jun 2017 00:08:40 +0000 (00:08 +0000)]
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev
Adrian Roos [Thu, 8 Jun 2017 00:00:25 +0000 (00:00 +0000)]
Merge "Keyguard: Increase clock size" into oc-dev
am:
2ff366a39a
Change-Id: I0369da0041d3d8bf001340e7e8f88a60894c2c7d
Ian Pedowitz [Thu, 8 Jun 2017 00:00:16 +0000 (00:00 +0000)]
Merge "Fixed an issue where the icons had the wrong color" into oc-dev
Adrian Roos [Wed, 7 Jun 2017 23:54:00 +0000 (23:54 +0000)]
Merge "Keyguard: Increase clock size" into oc-dev
Winson Chung [Wed, 7 Jun 2017 23:53:03 +0000 (16:53 -0700)]
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
Bryce Lee [Wed, 7 Jun 2017 23:33:43 +0000 (23:33 +0000)]
Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev
am:
f867733d4f
Change-Id: I7436b4e82365c2d83c1f38a856324e8e309920aa
Sundeep Ghuman [Wed, 7 Jun 2017 23:28:29 +0000 (23:28 +0000)]
Merge "Remove Wifi Badges from platform." into oc-dev
am:
09d06437ad
Change-Id: I939b42d12919635ddac9bdf91a17323f154001a9
Sundeep Ghuman [Wed, 7 Jun 2017 23:25:57 +0000 (23:25 +0000)]
Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev
am:
584406f8e1
Change-Id: I42fad81d99eb8ed540ef24fae1b4e86402b33a82
Bryce Lee [Wed, 7 Jun 2017 23:23:17 +0000 (23:23 +0000)]
Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev
TreeHugger Robot [Wed, 7 Jun 2017 23:19:04 +0000 (23:19 +0000)]
Merge "Remove Wifi Badges from platform." into oc-dev
TreeHugger Robot [Wed, 7 Jun 2017 23:18:07 +0000 (23:18 +0000)]
Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev
Bryce Lee [Wed, 7 Jun 2017 23:01:56 +0000 (23:01 +0000)]
Revert "Coordinate configuration changes and window frame size."
This reverts commit
afb45bba8379df530182dae882ec70329423dcfe.
Bug:
32839232
Fixes:
62424393
Change-Id: Ifaa0176e18100ec85b8c81268a26fb16ffe9b5f3
Todd Kennedy [Tue, 6 Jun 2017 16:15:46 +0000 (09:15 -0700)]
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
Selim Cinek [Wed, 7 Jun 2017 22:51:29 +0000 (15:51 -0700)]
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
Sanket Padawe [Wed, 7 Jun 2017 21:53:44 +0000 (21:53 +0000)]
Merge "Update strings for modem restricted state." into oc-dev
am:
58977d1035
Change-Id: Id08df9dfdc858dfc4dfb31e7c6ad85fbe2b1869a
Jorim Jaggi [Wed, 7 Jun 2017 21:46:41 +0000 (21:46 +0000)]
Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev
am:
fc1753d495
Change-Id: I2024b1b5e967fc64a4b068fd47643f94478dcf5c
Todd Kennedy [Wed, 7 Jun 2017 21:46:02 +0000 (14:46 -0700)]
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
TreeHugger Robot [Wed, 7 Jun 2017 21:42:33 +0000 (21:42 +0000)]
Merge "Update strings for modem restricted state." into oc-dev
TreeHugger Robot [Wed, 7 Jun 2017 21:40:00 +0000 (21:40 +0000)]
Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev
Hall Liu [Fri, 19 May 2017 22:28:09 +0000 (15:28 -0700)]
Embms download setup
Add MbmsDownloadReceiver and MbmsTempFileProvider to facilitate MBMS
download.
Fill in the download method in MbmsDownloadManager
Test: testapps
Change-Id: Ibb30f3b2b9d14b9df6b53c06916c21e3ca3a42c6
Selim Cinek [Wed, 7 Jun 2017 20:58:11 +0000 (20:58 +0000)]
Merge "Fixed a flicker of group notifications" into oc-dev
am:
beba1bf936
Change-Id: Ia5a12355fd1ed7ec8c9e4cea68e5b17764479ebd
Winson Chung [Wed, 7 Jun 2017 20:53:42 +0000 (20:53 +0000)]
Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev
am:
fd6b3c6da3
Change-Id: I262857f51aff127c3e1c4a223e22e7129060a9e7
Selim Cinek [Wed, 7 Jun 2017 20:47:47 +0000 (20:47 +0000)]
Merge "Fixed a flicker of group notifications" into oc-dev
TreeHugger Robot [Wed, 7 Jun 2017 20:46:15 +0000 (20:46 +0000)]
Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev
Jian Sun [Wed, 7 Jun 2017 20:37:51 +0000 (20:37 +0000)]
Merge "Notify registered packages of visible accounts change when authenticators get uninstalled." into oc-dev
am:
8d5b58a660
Change-Id: I21f8e344b794a5e24f92a0895843b7875b764eba
Jeff Sharkey [Wed, 7 Jun 2017 20:34:38 +0000 (14:34 -0600)]
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
Adrian Roos [Wed, 7 Jun 2017 19:18:05 +0000 (12:18 -0700)]
Keyguard: Increase clock size
Test: observe that keyguard clock looks slightly bigger now
Change-Id: Ic55582abb1cf82bf104afce7d1271e456c78aa1b
Fixes:
62105028
Jian Sun [Wed, 7 Jun 2017 20:31:00 +0000 (20:31 +0000)]
Merge "Notify registered packages of visible accounts change when authenticators get uninstalled." into oc-dev
Bookatz [Wed, 7 Jun 2017 19:30:07 +0000 (12:30 -0700)]
Avoid background getTotalTimeLocked misreporting
It has been discovered that for background values of
AggregatedWakelock, Sync, Job, and partial wakelocks,
the value of getTotalTimeLocked is wrong and often very
negative. getTotalDurationMsLocked, which should provide the exact same
value in all of these cases (since background data is never pooled),
does not have this problem. So while the source of the bug is sought
out, we should use getTotalDurationMsLocked instead of getTotalTimeLocked for
these data.
Bug:
62352334
Test: cts-tradefed run cts-dev -m CtsDumpsysHostTestCases -t android.dumpsys.cts.BatteryStatsDumpsysTest
Change-Id: I78e84368615578483ab8e9e5f0ee1d067491be08
Todd Kennedy [Fri, 2 Jun 2017 14:38:20 +0000 (07:38 -0700)]
Final changes to protect the API surface
This is it. The last set of changes to protect instant apps
from full apps.
Bug:
35871369
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
Test: Manual; install instant app and ensure it runs
Change-Id: If71385bcc9a5637590fbd99b0ffcd5ed8809509c
Julia Reynolds [Wed, 7 Jun 2017 20:21:38 +0000 (20:21 +0000)]
Merge "Revert "Change default for group alert behavior"" into oc-dev
am:
6e96251d92
Change-Id: I167f941e2f09f240dd6109f849ccd87dee57f47c
Julia Reynolds [Wed, 7 Jun 2017 20:12:21 +0000 (20:12 +0000)]
Merge "Revert "Change default for group alert behavior"" into oc-dev
Andreas Gampe [Fri, 2 Jun 2017 00:17:23 +0000 (17:17 -0700)]
Framework: Remove SamplingProfiler
Remove the very old and unsupported SamplingProfilerIntegration. This
CL removes the code parts.
(cherry picked from commit
d52cad2cc9af5eb54b28b69fa5b8242258e590ae)
Bug:
37272346
Test: m
Test: Device boots
Change-Id: I64d77244b5816ef1f605d19530b96be38f5c1bc6
Sundeep Ghuman [Tue, 6 Jun 2017 19:27:25 +0000 (12:27 -0700)]
DO NOT MERGE: Kill Wifi Badging in OC.
Speed labeling is turned on in O-DR hence this CL should not be merged
into master. Using the merged in tag below which implements speed
labeling (ag/
2346102) to prevent this CL from being merged into upstream
branches which need scoring ui.
Merged-In: I0fd96da6a06dafd8c8ebb435a2725ab155bd26ed
Bug: b/
35628911
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Change-Id: I5740f68be25d5ec297f1f7dc3b3e59203cec2eb5
Jorim Jaggi [Wed, 7 Jun 2017 19:38:19 +0000 (12:38 -0700)]
Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND
To make sure we won't cause SystemUI to draw the black status bar
background while the starting window is visible.
Test: Warm open chrome
Test: go/wm-smoke
Bug:
38136531
Change-Id: I8dfc0926cafef9d41e78a637523316ac46ce05df
Doris Liu [Wed, 7 Jun 2017 19:37:26 +0000 (19:37 +0000)]
Merge "Better error message for AVD" into oc-dev
am:
cabf9cdc2e
Change-Id: I96b7ac9525e4096da2662f1c1973e2ee52008cfc
Doris Liu [Wed, 7 Jun 2017 19:31:09 +0000 (19:31 +0000)]
Merge "Better error message for AVD" into oc-dev
Jeff Sharkey [Wed, 7 Jun 2017 19:12:59 +0000 (19:12 +0000)]
Merge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev
am:
6746aa8c4d
Change-Id: I6b78fba341499617e279b38f2e1885cd58551b0d
Jeff Sharkey [Wed, 7 Jun 2017 19:03:54 +0000 (19:03 +0000)]
Merge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev
Jason Monk [Wed, 7 Jun 2017 17:02:47 +0000 (13:02 -0400)]
Move QS cell indicator back into mobile data tile
Remove it from the header and drop it back in its old location.
This reverts commit
10b4c8a4ab3fc1fd55e5a636066e210ad17cf92b.
Test: runtest systemui
Fixes:
62331189
Change-Id: I087589c256894e0972656619e665b6a16536ce6c