OSDN Git Service
Julius D'souza [Tue, 6 Jun 2017 21:36:50 +0000 (21:36 +0000)]
Merge "Add state machine model for skipping initial brightness ramps." into oc-dev
am:
9fd3076fe6
Change-Id: If95a7b60b75f06eb3c67de24b837c26ce259db92
Julius D'souza [Tue, 6 Jun 2017 21:29:39 +0000 (21:29 +0000)]
Merge "Add state machine model for skipping initial brightness ramps." into oc-dev
Aurimas Liutikas [Tue, 6 Jun 2017 21:29:29 +0000 (21:29 +0000)]
Merge "Remove usages of ActionBarActivity." into oc-dev
am:
c742b8ab2d
Change-Id: Ie10c1ddf16fa238b2e2ee5b0c58b1cff3981433f
TreeHugger Robot [Tue, 6 Jun 2017 21:20:39 +0000 (21:20 +0000)]
Merge "Remove usages of ActionBarActivity." into oc-dev
Christopher Tate [Tue, 6 Jun 2017 20:32:55 +0000 (20:32 +0000)]
Merge "Fix #
62350081 - annotate permission requirements" into oc-dev
am:
42abe82bbb
Change-Id: I3b8415aac86f9dfd6457e5eca7dce904b1bfef7c
Jorim Jaggi [Tue, 6 Jun 2017 20:30:08 +0000 (20:30 +0000)]
Fix issue with dialer launch transition
am:
db93133782
Change-Id: Id1808ca8d1f2547ecb85679c4b7697ee37f69d9f
TreeHugger Robot [Tue, 6 Jun 2017 20:18:16 +0000 (20:18 +0000)]
Merge "Fix #
62350081 - annotate permission requirements" into oc-dev
Jorim Jaggi [Thu, 1 Jun 2017 23:07:34 +0000 (16:07 -0700)]
Fix issue with dialer launch transition
Test: Disable assistant, launch dialer on secure keyguard
Test: Launch assistant
Test: Launch camera
Change-Id: Ic3231f5f28fa0cf704b5f5d6e1993b296f14f5a3
Fixes:
38450585
Bryce Lee [Tue, 6 Jun 2017 19:52:35 +0000 (19:52 +0000)]
Merge "Associate freezing display with a target display id." into oc-dev
am:
1795242288
Change-Id: I41ae908e86152f42590fc346db382419c5b0a27b
Bryce Lee [Tue, 6 Jun 2017 19:42:40 +0000 (19:42 +0000)]
Merge "Associate freezing display with a target display id." into oc-dev
Matthew Ng [Tue, 6 Jun 2017 19:24:43 +0000 (19:24 +0000)]
Merge "Add back recents staggering entrance animation" into oc-dev
am:
229119e06b
Change-Id: I4516daadd7ec9ceba523b3b6e1d58f6843c7600d
TreeHugger Robot [Tue, 6 Jun 2017 19:09:12 +0000 (19:09 +0000)]
Merge "Add back recents staggering entrance animation" into oc-dev
Sundeep Ghuman [Tue, 6 Jun 2017 18:51:54 +0000 (18:51 +0000)]
Merge "Don't show unset score values for AccessPoints." into oc-dev
am:
32c65fccaf
Change-Id: I40586bcf4ab1fc32a15c145798460008ded764d1
Jian Sun [Tue, 6 Jun 2017 18:48:33 +0000 (18:48 +0000)]
Merge "Fix visibility issue in AccountManager.getAuthTokenByFeatures." into oc-dev
am:
f1946baae7
Change-Id: Iacba4bd641367f5cf64bcd4d7098bba05fca835d
TreeHugger Robot [Tue, 6 Jun 2017 18:45:11 +0000 (18:45 +0000)]
Merge "Don't show unset score values for AccessPoints." into oc-dev
Jian Sun [Tue, 6 Jun 2017 18:29:58 +0000 (18:29 +0000)]
Merge "Fix visibility issue in AccountManager.getAuthTokenByFeatures." into oc-dev
Wale Ogunwale [Tue, 6 Jun 2017 17:53:46 +0000 (17:53 +0000)]
Merge "Don't allow removed DividerView to resize stack" into oc-dev
am:
d7427d5d90
Change-Id: I6dfe65d2d3e2c69be14b472dcd3e28389e70655f
TreeHugger Robot [Tue, 6 Jun 2017 17:46:31 +0000 (17:46 +0000)]
Merge "Don't allow removed DividerView to resize stack" into oc-dev
Sundeep Ghuman [Mon, 5 Jun 2017 23:10:38 +0000 (16:10 -0700)]
Don't show unset score values for AccessPoints.
Merged-In: I0fd96da6a06dafd8c8ebb435a2725ab155bd26ed
Bug: b/
3692675
Test: Visual confirmation
Change-Id: I52909bf55e6efabd2be6c17542f2a15135d25c62
Makoto Onuki [Tue, 6 Jun 2017 16:44:59 +0000 (16:44 +0000)]
Merge "Refer to ShortcutManagerCompat in the javadoc" into oc-dev
am:
a9c185f6e7
Change-Id: If571669aaa81d085774c1bb9a0daa308f237978a
Makoto Onuki [Tue, 6 Jun 2017 16:26:05 +0000 (16:26 +0000)]
Merge "Refer to ShortcutManagerCompat in the javadoc" into oc-dev
Wale Ogunwale [Tue, 6 Jun 2017 15:31:17 +0000 (08:31 -0700)]
Don't allow removed DividerView to resize stack
If a divider view is removed or in the process of been removed, then it
should no longer have any influence on the size of stacks.
Fixes:
62273599
Test: go/wm-smoke
Test: enter split-screen and make sure recents is visible, lock and
unlock the device and verify things look fine.
Change-Id: I79aca82be8a7013328b78e82f508c4ed9fa48a4a
Jeff Sharkey [Tue, 6 Jun 2017 15:28:26 +0000 (15:28 +0000)]
Merge "Give Doclava our manifest; more permission docs." into oc-dev
am:
65d4cbba37
Change-Id: I2ec50efb67debd15d354db69b84fb620eb74bc0e
Jeff Sharkey [Tue, 6 Jun 2017 15:19:19 +0000 (15:19 +0000)]
Merge "Give Doclava our manifest; more permission docs." into oc-dev
Aurimas Liutikas [Thu, 18 May 2017 17:51:48 +0000 (10:51 -0700)]
Remove usages of ActionBarActivity.
ActionBarActivity has been deprecated for 2+ years and has been
extending AppCompatActivity for all that time. These changes
should be no-ops.
Bug:
35253513
Test: None
Change-Id: Ica46ccbc2b29a6a3399f7deed6045c1f7e1cd429
(cherry picked from commit
19bda3d9176b02198df4cec807d86e6797f8993e)
Bryce Lee [Tue, 6 Jun 2017 00:25:59 +0000 (17:25 -0700)]
Associate freezing display with a target display id.
Currently, start/stop freezing is always associated with the default
display. As a result, any animations that result from freezing will
occur on the default display. One situation this happens is during a
configuration change, where a screen rotation can be triggered. In
the case of adding a secondary display, a configuration change is
always triggered to apply the override configuration at the display
level. As a result, the default display exhibits a rotation animation
upon unfreezing during surface placement.
This changelist passes down the display id associated with the action
so that the animations may be applied to the right display. In the
scenario described perviously, the secondary display id is passed down
and therefore is the target of the rotation animation during
unfreezing.
Fixes:
35486733
Test: go/wm-smoke
Test: cts-tradefed run singleCommand cts-dev --module CtsViewTestCases --test android.view.cts.SurfaceViewSyncTest#testSmallRect
Change-Id: I87e56f5901934327fc50b3c7e543b5e36b8ff34f
Rebecca Silberstein [Tue, 6 Jun 2017 14:49:57 +0000 (14:49 +0000)]
Merge "WifiConfiguration: add local only networkId" into oc-dev
am:
46f4d5c4a6
Change-Id: I76454a05fdeec94b84d0bfb6f084790e0a7f77d5
Rebecca Silberstein [Tue, 6 Jun 2017 14:42:54 +0000 (14:42 +0000)]
Merge "WifiConfiguration: add local only networkId" into oc-dev
Bryce Lee [Tue, 6 Jun 2017 14:38:58 +0000 (14:38 +0000)]
Merge "Coordinate configuration changes and window frame size." into oc-dev
am:
749cbb1911
Change-Id: I2a27d8b34967603b0621332651a31be025542c09
Bryce Lee [Tue, 6 Jun 2017 14:26:28 +0000 (14:26 +0000)]
Merge "Coordinate configuration changes and window frame size." into oc-dev
Paul Duffin [Tue, 6 Jun 2017 08:13:12 +0000 (08:13 +0000)]
Merge "Added android.test.mock and android.test.mock.sdk targets" am:
46f8d427c4 am:
de30ee2d40
am:
e468747115
Change-Id: I50e3ae83eabe75cb87e0dd25acd05eee811c25ce
Paul Duffin [Tue, 6 Jun 2017 08:01:41 +0000 (08:01 +0000)]
Merge "Added android.test.mock and android.test.mock.sdk targets" am:
46f8d427c4
am:
de30ee2d40
Change-Id: I4f615991b43350df9748d7f05fdcf5501eff135d
Paul Duffin [Tue, 6 Jun 2017 07:49:39 +0000 (07:49 +0000)]
Merge "Added android.test.mock and android.test.mock.sdk targets"
am:
46f8d427c4
Change-Id: I93ecb5e95337b84c2746b802fa88382cdd676cb8
Paul Duffin [Tue, 6 Jun 2017 07:40:17 +0000 (07:40 +0000)]
Merge "Added android.test.mock and android.test.mock.sdk targets"
Erik Kline [Tue, 6 Jun 2017 05:16:27 +0000 (05:16 +0000)]
Merge "Support setting upstream parameters." am:
faf8d67749 am:
4e5024131b
am:
e2018a407a
Change-Id: I8e0f7188ff29b2fd7c34fd2a340c8b4abaac2be7
Erik Kline [Tue, 6 Jun 2017 05:05:04 +0000 (05:05 +0000)]
Merge "Support setting upstream parameters." am:
faf8d67749
am:
4e5024131b
Change-Id: I150015ea0c66be50e79f641f20d1752b9d60cb0d
Erik Kline [Tue, 6 Jun 2017 04:54:04 +0000 (04:54 +0000)]
Merge "Support setting upstream parameters."
am:
faf8d67749
Change-Id: I0be9ad265fa664f0ce6e1e098996b46c88317b97
Treehugger Robot [Tue, 6 Jun 2017 04:43:32 +0000 (04:43 +0000)]
Merge "Support setting upstream parameters."
Bryce Lee [Thu, 27 Apr 2017 20:42:23 +0000 (13:42 -0700)]
Coordinate configuration changes and window frame size.
Previously, it was possible for the view hierarchy to be measured,
laid out, and drawn around a window frame size that did not match
the current configuration. This stems from new configurations not
always propagating back from WindowSession#relayout, which is
called from ViewRootImpl.
This changelist makes WindowManagerService#relayoutWindow always
return the latest configuration. It also adds rotation to the
configuration.
Fixes:
32839232
Test: go/wm-smoke
Test: Open Camera while rotating phone to landscape. Added
temporary logs to detect inconsistencies between measurements
and reported rotation on draw.
Change-Id: I39daca338b4f87eff1a509eb99493f01e710ced1
Guang Zhu [Tue, 6 Jun 2017 03:38:52 +0000 (03:38 +0000)]
Merge "Revert "Disabled task snapshot for TV"" into oc-dev
am:
faf86491e9
Change-Id: I360c924fc3335a72c6cf46b30ee9749838e97433
Guang Zhu [Tue, 6 Jun 2017 03:29:05 +0000 (03:29 +0000)]
Merge "Revert "Disabled task snapshot for TV"" into oc-dev
Guang Zhu [Tue, 6 Jun 2017 03:27:44 +0000 (03:27 +0000)]
Revert "Disabled task snapshot for TV"
Bug:
62360140
Bug:
62040693
This reverts commit
4256422eb6752294a08f4701dd66798652a8059f.
Change-Id: Id89de52c9ad25ef7b3163bd8b4a0c44f97631431
Erik Kline [Thu, 1 Jun 2017 11:11:25 +0000 (20:11 +0900)]
Support setting upstream parameters.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
29337859
Bug:
32163131
Bug:
34361337
Change-Id: Id88cae4beed7d38aec3d29a0e2f59a5c7e6a9a4e
Todd Kennedy [Tue, 6 Jun 2017 01:49:12 +0000 (01:49 +0000)]
Merge "Don't verify instant apps" into oc-dev
am:
9bac79a540
Change-Id: I63537d6e6048152f93b5d314250334bcb1e75520
TreeHugger Robot [Tue, 6 Jun 2017 01:41:08 +0000 (01:41 +0000)]
Merge "Don't verify instant apps" into oc-dev
Christopher Tate [Tue, 6 Jun 2017 01:13:52 +0000 (18:13 -0700)]
Fix #
62350081 - annotate permission requirements
The Alarm Manager APIs that allow callers to ascribe wakelock time
to other apps are gated on the UPDATE_DEVICE_STATS permission.
Document this with the appropriate annotation.
Test: N/A
Change-Id: Idf5548089fb7d2235139ae8ba7bf58e7f455eb33
Jayachandran C [Tue, 6 Jun 2017 00:39:38 +0000 (00:39 +0000)]
Merge "Add ERI (enhanced roaming indicator) 66 to list of home ERIs for Verizon" into oc-dev
am:
4deefdbe7a
Change-Id: I57053efb8796c22899c6b0dbdafe26377f70a530
TreeHugger Robot [Tue, 6 Jun 2017 00:30:02 +0000 (00:30 +0000)]
Merge "Add ERI (enhanced roaming indicator) 66 to list of home ERIs for Verizon" into oc-dev
Keyvan Amiri [Tue, 6 Jun 2017 00:22:07 +0000 (00:22 +0000)]
Merge "Disabled task snapshot for TV" into oc-dev
am:
4cddd9a723
Change-Id: I4de52f4ac20c9f9ec99bbc810735e98f1537708e
Robert Carr [Tue, 6 Jun 2017 00:09:17 +0000 (00:09 +0000)]
Merge "Reinstate SurfaceView Background from N" into oc-dev
am:
71044d6ba1
Change-Id: I5a4e8a5c8c45add308b115bc447f85393d572e00
TreeHugger Robot [Tue, 6 Jun 2017 00:04:31 +0000 (00:04 +0000)]
Merge "Disabled task snapshot for TV" into oc-dev
TreeHugger Robot [Mon, 5 Jun 2017 23:57:01 +0000 (23:57 +0000)]
Merge "Reinstate SurfaceView Background from N" into oc-dev
Lucas Dupin [Mon, 5 Jun 2017 23:40:12 +0000 (23:40 +0000)]
Merge "Fix icon tint on notification shelf" into oc-dev
am:
285ad4ce66
Change-Id: Ifbc2c1829182aa47de9e835a3bbeac7146a31d1b
Jeff Sharkey [Mon, 5 Jun 2017 23:38:17 +0000 (17:38 -0600)]
Give Doclava our manifest; more permission docs.
We've seen some @SystemApi methods protected with non-system
permissions, so give Doclava the platform AndroidManifest.xml so it
can parse the actual permission protection levels to look for APIs
that are letting in non-system apps.
Also document more @SystemApi permissions.
This is purely a docs change; no logic changes are being made.
Test: make -j32 update-api
Bug:
62263906
Change-Id: Ie0f0a5fb0033817bcc95060f2183a52ae4ae7b06
TreeHugger Robot [Mon, 5 Jun 2017 23:29:42 +0000 (23:29 +0000)]
Merge "Fix icon tint on notification shelf" into oc-dev
Winson Chung [Mon, 5 Jun 2017 22:47:28 +0000 (22:47 +0000)]
Merge "Initialize last-orientation to ensure we don't skip loading config." into oc-dev
am:
5fc8f7d08a
Change-Id: I1ca302446a3bff3c1f3096f353ca8b081e13e816
TreeHugger Robot [Mon, 5 Jun 2017 22:37:02 +0000 (22:37 +0000)]
Merge "Initialize last-orientation to ensure we don't skip loading config." into oc-dev
Jeff Sharkey [Mon, 5 Jun 2017 22:28:21 +0000 (22:28 +0000)]
Merge "Annotate @SystemApi with required permissions." into oc-dev
am:
c1406978a4
Change-Id: I305967cad945a807c3f8234efabaad0ef8b591d1
Jeff Sharkey [Mon, 5 Jun 2017 22:19:41 +0000 (22:19 +0000)]
Merge "Annotate @SystemApi with required permissions." into oc-dev
Android Build Merger (Role) [Mon, 5 Jun 2017 21:59:16 +0000 (21:59 +0000)]
Merge "Merge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw-f-dev am:
7a5dd1c3ff am:
51a89ee90c am:
102b9e5968" into oc-dev-plus-aosp
Erik Wolsheimer [Mon, 5 Jun 2017 21:58:11 +0000 (21:58 +0000)]
Merge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw-f-dev am:
7a5dd1c3ff am:
51a89ee90c
am:
102b9e5968
Change-Id: If7e8d4d2cdc734bab90b4abf0f2cba16645e4a6d
Erik Wolsheimer [Mon, 5 Jun 2017 21:56:29 +0000 (21:56 +0000)]
Merge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw-f-dev am:
7a5dd1c3ff am:
51a89ee90c
am:
2c5e537e6c
Change-Id: Ie8f090c0049715bfc2d23a4f2d1f8d90c227b0e2
Erik Wolsheimer [Mon, 5 Jun 2017 21:46:36 +0000 (21:46 +0000)]
Merge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw-f-dev am:
7a5dd1c3ff
am:
51a89ee90c
Change-Id: I982b94c155849061a667b1bf90f7a511bb81b1c5
Erik Wolsheimer [Mon, 5 Jun 2017 21:46:26 +0000 (21:46 +0000)]
Merge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw-f-dev am:
7a5dd1c3ff
am:
51a89ee90c
Change-Id: I154876bd0294d0e31af63ed2e24c91d243eae56f
Erik Wolsheimer [Mon, 5 Jun 2017 21:38:33 +0000 (21:38 +0000)]
Merge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw-f-dev
am:
7a5dd1c3ff
Change-Id: Ida35556f6d57113ad06c736ef780580b814f673e
Jason Monk [Mon, 5 Jun 2017 21:37:29 +0000 (21:37 +0000)]
Merge "Fix tinting of guest icon in QS footer" into oc-dev
am:
8490ed92e1
Change-Id: I68e4c923defcddf528472504561d9a294ddb5569
Sudheer Shanka [Mon, 5 Jun 2017 21:31:19 +0000 (21:31 +0000)]
Merge "Ignore entries for isolated uids if there's no mapping for them." into oc-dev
am:
057bad9c9d
Change-Id: I536deea7b77c202b788f6d985574a9629d9bd1f1
TreeHugger Robot [Mon, 5 Jun 2017 21:26:39 +0000 (21:26 +0000)]
Merge "Fix tinting of guest icon in QS footer" into oc-dev
TreeHugger Robot [Mon, 5 Jun 2017 21:24:44 +0000 (21:24 +0000)]
Merge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw-f-dev
Sudheer Shanka [Mon, 5 Jun 2017 21:22:32 +0000 (21:22 +0000)]
Merge "Ignore entries for isolated uids if there's no mapping for them." into oc-dev
Matthew Ng [Fri, 2 Jun 2017 19:46:33 +0000 (12:46 -0700)]
Add back recents staggering entrance animation
Since there was a change in ValueAnimator that did not allow setting
initial play time per interpolator grouped in an AnimatorSet, set the
initial play time for each animation to allow the same effect.
Change-Id: I05445bde6e185a99250d7d193bd0e74d5ce98fa0
Fixes:
36175824
Test: manual - launch recents
sunjian [Thu, 11 May 2017 22:42:31 +0000 (15:42 -0700)]
Fix visibility issue in AccountManager.getAuthTokenByFeatures.
Bug:
34679769
Test: manual, APCT
Change-Id: I7270a5a5dd681ad088fa28e48d849ba3541e45cd
Jason Monk [Mon, 5 Jun 2017 19:56:42 +0000 (19:56 +0000)]
Merge "Fix up some jank from unnecessary reinflation" into oc-dev
am:
f6e2099063
Change-Id: I32bbb4c1bbe5a477565ceb0382cc859c53283fdf
Jason Monk [Mon, 5 Jun 2017 19:50:06 +0000 (19:50 +0000)]
Merge "Fix up some jank from unnecessary reinflation" into oc-dev
Wale Ogunwale [Mon, 5 Jun 2017 19:39:30 +0000 (19:39 +0000)]
Merge "Added mising sendToTarget message for dismissing docked stack" into oc-dev
am:
6cc151468b
Change-Id: Ia4a52090fa9353fee4333da78d218b4a967b9500
Jeff Sharkey [Fri, 2 Jun 2017 23:36:26 +0000 (17:36 -0600)]
Annotate @SystemApi with required permissions.
Most @SystemApi methods should be protected with system (or higher)
permissions, so annotate common methods with @RequiresPermission to
make automatic verification easier.
Verification is really only relevant when calling into system
services (where permissions checking can happen on the other side of
a Binder call), so annotate managers with the new @SystemService
annotation, which is now automatically documented.
This is purely a docs change; no logic changes are being made.
Test: make -j32 update-api && make -j32 offline-sdk-docs
Bug:
62263906
Change-Id: I2554227202d84465676aa4ab0dd336b5c45fc651
TreeHugger Robot [Mon, 5 Jun 2017 19:18:05 +0000 (19:18 +0000)]
Merge "Added mising sendToTarget message for dismissing docked stack" into oc-dev
Daniel Sandler [Mon, 5 Jun 2017 19:15:12 +0000 (19:15 +0000)]
Merge changes from topic 'dungeon' into oc-dev
am:
36a673a7d7
Change-Id: Idcad938ed14dac66e6b701cefd9dc79c499eb645
Keyvan Amiri [Sat, 3 Jun 2017 00:28:31 +0000 (17:28 -0700)]
Disabled task snapshot for TV
This was causing memory leaks when opening/closing Apps view. Will
disable this feature on TV since we are running low on RAM.
Bug:
62040693
Test: Compiles
Change-Id: Ifc43118dd072f17a047003d1797004bd441669b8
Daniel Sandler [Mon, 5 Jun 2017 19:03:26 +0000 (19:03 +0000)]
Merge changes from topic 'dungeon' into oc-dev
* changes:
Hide redundant foreground service notifications.
Updates to Dianne's Dungeon.
Jerry Zhang [Mon, 5 Jun 2017 18:45:09 +0000 (18:45 +0000)]
Merge "Remove ptp from persist config on boot" into oc-dev
am:
1d1cf13056
Change-Id: I6c9afcc05fa88bbbbe63ddd3ab948e887c350505
Jerry Zhang [Mon, 5 Jun 2017 18:36:58 +0000 (18:36 +0000)]
Merge "Remove ptp from persist config on boot" into oc-dev
Todd Kennedy [Fri, 2 Jun 2017 19:49:34 +0000 (12:49 -0700)]
Don't verify instant apps
Change-Id: I07bc45bc82d1cbd2012c4605d5ca19f2ef36d615
Fixes:
62202471
Test: Manual; install instant app, see verification is disabled
Test: Manual; install full app, see verification is enabled
Adam Lesinski [Mon, 5 Jun 2017 17:54:37 +0000 (17:54 +0000)]
Merge "DO NOT MERGE: AAPT2: Allow undefined resources (placeholders)" into oc-dev
am:
2f84c4715d
Change-Id: I266b8648e9aa292befa02c4e7dc0ce54f0b26e21
Sudheer Shanka [Fri, 2 Jun 2017 23:48:13 +0000 (16:48 -0700)]
Ignore entries for isolated uids if there's no mapping for them.
Bug:
25195548
Test: manual
Change-Id: If5aa7e194f4d43f2a7068899b9aa6584bfb2b7cc
Adam Lesinski [Mon, 5 Jun 2017 17:34:57 +0000 (17:34 +0000)]
Merge "DO NOT MERGE: AAPT2: Allow undefined resources (placeholders)" into oc-dev
Jason Monk [Mon, 5 Jun 2017 16:59:49 +0000 (12:59 -0400)]
Fix tinting of guest icon in QS footer
Test: visual
Change-Id: I1daaac94e6bbff2e94583e1501c43beb4d9f757f
Fixes:
62339982
Jason Monk [Mon, 5 Jun 2017 15:33:48 +0000 (11:33 -0400)]
Fix up some jank from unnecessary reinflation
Don't need to re-inflate fragments because of ui mode change.
Test: manual
Change-Id: I8cb8ff4f64b5c1cb5982d39c6acced682eaa4d41
Fixes:
62041537
Erik Wolsheimer [Mon, 5 Jun 2017 16:49:28 +0000 (16:49 +0000)]
Revert "Fix race condition triggered by quick stop/start of Dream"
Causes another race condition
This reverts commit
69515b2261335be4bd8510ed5a40a6bed3d7b48f.
Bug:
62147987
Change-Id: Ibe6f9bc14ed6cc35d3a23d52300657eaed9bb6d8
Todd Kennedy [Mon, 5 Jun 2017 16:44:45 +0000 (16:44 +0000)]
Merge "Protect instant apps from full apps" into oc-dev
am:
4972aa30bf -s ours
Change-Id: I8e42b3f3b54b86f1bc7b2d3dc29973d96b7eb3a5
TreeHugger Robot [Mon, 5 Jun 2017 16:35:22 +0000 (16:35 +0000)]
Merge "Protect instant apps from full apps" into oc-dev
Julia Reynolds [Mon, 5 Jun 2017 15:30:31 +0000 (15:30 +0000)]
Merge "Annotate locks" into oc-dev
am:
373ab72112
Change-Id: I7b84a944d19c1a51d3893149e98c9e6ac96ba2af
Julia Reynolds [Mon, 5 Jun 2017 15:22:53 +0000 (15:22 +0000)]
Merge "Annotate locks" into oc-dev
Dan Sandler [Sun, 28 May 2017 16:18:53 +0000 (12:18 -0400)]
Hide redundant foreground service notifications.
If an app with a foreground service has (at least one)
FLAG_FOREGROUND notification shown to the user, we allow
that to satisfy the requirement that the user be informed
about such things. But if the fg notification or its channel
is blocked by the user, we show the NOTE_FOREGROUND_SERVICES
notification (a/k/a Dianne's Dungeon) provided to us by the
activity manager.
Note that if even one of the foreground processes for the
current user is missing its disclosure notification, the
user will see the whole dungeon.
Bug:
36891897
Test: runtest -x frameworks/base/packages/SystemUI/tests/src/com/android/systemui/ForegroundServiceControllerTest.java
Change-Id: I4f5d96f80b7c1901faadb56661a42d26f746aa88
Dan Sandler [Thu, 25 May 2017 04:15:49 +0000 (00:15 -0400)]
Updates to Dianne's Dungeon.
- new EKG icon
- set the notification timestamp to the oldest service
start time, so you have some idea how long things have been
this way
- minor text fixes
Bug:
36891897
Test: runtest -x cts/tests/app/src/android/app/cts/ServiceTest.java
Change-Id: I99db280cde8ca3ecd7205cd44fac159d8f652ca2
Wale Ogunwale [Mon, 5 Jun 2017 14:09:35 +0000 (07:09 -0700)]
Added mising sendToTarget message for dismissing docked stack
Toast that an app doesn't support split screen wasn't displaying because
of missing line to actually send the
NOTIFY_ACTIVITY_DISMISSING_DOCKED_STACK_MSG message.
Test: Dock an app and the launch an other app that doesn't support
split-screen and make sure the "doesn't support split-screen" toast
shows up.
Test: go/wm-smoke
Fixes:
62281412
Change-Id: Ia2cb3085b6c6bfd27cf9e825315b8ddc89cf5bcd
Julia Reynolds [Mon, 5 Jun 2017 13:20:23 +0000 (13:20 +0000)]
Merge "Don't allow blocked apps to post notifications" into oc-dev
am:
2f77da6e10
Change-Id: I17808b200cba543f163bea8e3326bcce4792ef1f
Julia Reynolds [Mon, 5 Jun 2017 13:12:51 +0000 (13:12 +0000)]
Merge "Don't allow blocked apps to post notifications" into oc-dev
Paul Duffin [Fri, 19 May 2017 08:05:54 +0000 (09:05 +0100)]
Added android.test.mock and android.test.mock.sdk targets
The android.test.mock will be used for any targets that require
android.test.mock classes but which do not already depend on the
sdk. It is also the library that will be added to the classpath
at runtime when an app has the following in their manifest.
<uses-library android:name="android.test.mock"/>
The android.test.mock.sdk will be used by targets that require
android.test.mock classes and which build against the SDK. It
contains stub classes (like android.jar). It is also the library
that will be copied into the optional directory of the SDK.
(cherry picked from
f74752293d1d25633aebc42c600717d0296a0820)
Bug:
30188076
Test: make checkbuild
Change-Id: If199180e1136da1927a9e7c7bcafbcfb29cf1274
Merged-In: Ia3fcd47c644b8e5a573f891571a7b3772eac63f9
Hugo Benichi [Mon, 5 Jun 2017 07:47:32 +0000 (07:47 +0000)]
Fix captive portal login ssl error overflow
am:
c991275325 -s ours
Change-Id: I258a2e8656ae8ab23855f80057a5e2733959660b