OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Catch WindowManager exceptions so they don't crash the system." into oc-dev
Felipe Leme [Tue, 6 Jun 2017 23:44:42 +0000 (23:44 +0000)]
Merge "Catch WindowManager exceptions so they don't crash the system." into oc-dev
am: 301fc823f3

Change-Id: Ib28ae2a7b3614fa73fa4e1b08e5607f7d6011891

7 years agoMerge "Handle renamed packages during default grants" into oc-dev
Todd Kennedy [Tue, 6 Jun 2017 23:41:06 +0000 (23:41 +0000)]
Merge "Handle renamed packages during default grants" into oc-dev
am: bfc083c3a0

Change-Id: I068bb7548d1c972c3824185e5ab933a7b48c387b

7 years agoMerge "Catch WindowManager exceptions so they don't crash the system." into oc-dev
Felipe Leme [Tue, 6 Jun 2017 23:30:57 +0000 (23:30 +0000)]
Merge "Catch WindowManager exceptions so they don't crash the system." into oc-dev

7 years agoMerge "Handle renamed packages during default grants" into oc-dev
Todd Kennedy [Tue, 6 Jun 2017 23:29:05 +0000 (23:29 +0000)]
Merge "Handle renamed packages during default grants" into oc-dev

7 years agoMerge "Fixed an issue where would could be left with empty notifications" into oc-dev
Selim Cinek [Tue, 6 Jun 2017 23:02:41 +0000 (23:02 +0000)]
Merge "Fixed an issue where would could be left with empty notifications" into oc-dev
am: 25e509462f

Change-Id: I69457f9a26085bc98e24b0c975106ddaa3199e98

7 years agoMerge "Fixed an issue where would could be left with empty notifications" into oc-dev
TreeHugger Robot [Tue, 6 Jun 2017 22:54:36 +0000 (22:54 +0000)]
Merge "Fixed an issue where would could be left with empty notifications" into oc-dev

7 years agoMerge "resolve merge conflicts of be23ef368f1a to oc-dev-plus-aosp" into oc-dev-plus...
Daniel Sandler [Tue, 6 Jun 2017 22:53:00 +0000 (22:53 +0000)]
Merge "resolve merge conflicts of be23ef368f1a to oc-dev-plus-aosp" into oc-dev-plus-aosp

7 years agoMerge "Disabled task snapshot for TV" into oc-dev
Keyvan Amiri [Tue, 6 Jun 2017 22:05:13 +0000 (22:05 +0000)]
Merge "Disabled task snapshot for TV" into oc-dev
am: 08b953dd2e

Change-Id: I220460741e82abbfaf3746763cbb4b09e9357965

7 years agoMerge "Disabled task snapshot for TV" into oc-dev
TreeHugger Robot [Tue, 6 Jun 2017 21:56:16 +0000 (21:56 +0000)]
Merge "Disabled task snapshot for TV" into oc-dev

7 years agoUpdate AccountManagerService side logic for .getAccountsByTypeForPackage with null...
sunjian [Tue, 6 Jun 2017 21:56:07 +0000 (21:56 +0000)]
Update AccountManagerService side logic for .getAccountsByTypeForPackage with null type.
am: d62dc39dc5

Change-Id: Idf3475786676e9713e4fa5756ecce9c675da8c3e

7 years agoUpdate AccountManagerService side logic for .getAccountsByTypeForPackage
sunjian [Thu, 1 Jun 2017 19:05:59 +0000 (12:05 -0700)]
Update AccountManagerService side logic for .getAccountsByTypeForPackage
with null type.

Bug: 37987384
Test: manual, APCT
Change-Id: I4d5f735736f1b1d7bbf778aee2ec813071c34f19

7 years agoMerge "Add state machine model for skipping initial brightness ramps." into oc-dev
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

7 years agoMerge "Add state machine model for skipping initial brightness ramps." into oc-dev
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

7 years agoMerge "Remove usages of ActionBarActivity." 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

7 years agoMerge "Remove usages of ActionBarActivity." into oc-dev
TreeHugger Robot [Tue, 6 Jun 2017 21:20:39 +0000 (21:20 +0000)]
Merge "Remove usages of ActionBarActivity." into oc-dev

7 years agoHandle renamed packages during default grants
Todd Kennedy [Tue, 6 Jun 2017 20:44:09 +0000 (13:44 -0700)]
Handle renamed packages during default grants

If a device has a privileged app on the system image which was
updated and a future OTA renames the app package (supported only for
privileged apps) we end up with a disabled system package setting
with no package information. Since we are not doing a null check
of the package we get from the disabled package settings during
default grants we crash leaving the system in a bad state.

Test: Manual
Change-Id: Id7255c92a4a52e368266739cd331977256eee2d3
Fixes: 62376260

7 years agoresolve merge conflicts of be23ef368f1a to oc-dev-plus-aosp
Jason Monk [Tue, 6 Jun 2017 20:38:00 +0000 (16:38 -0400)]
resolve merge conflicts of be23ef368f1a to oc-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I5364727a21f62fc479c9bca6ad7ab2c3b62d1d1b

7 years agoMerge "Fix #62350081 - annotate permission requirements" 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

7 years agoFix issue with dialer launch transition
Jorim Jaggi [Tue, 6 Jun 2017 20:30:08 +0000 (20:30 +0000)]
Fix issue with dialer launch transition
am: db93133782

Change-Id: Id1808ca8d1f2547ecb85679c4b7697ee37f69d9f

7 years agoMerge "Fix #62350081 - annotate permission requirements" into oc-dev
TreeHugger Robot [Tue, 6 Jun 2017 20:18:16 +0000 (20:18 +0000)]
Merge "Fix #62350081 - annotate permission requirements" into oc-dev

7 years agoFix issue with dialer launch transition
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

7 years agoMerge "Associate freezing display with a target display id." into oc-dev
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

7 years agoMerge "Associate freezing display with a target display id." into oc-dev
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

7 years agoDisabled task snapshot for TV
Keyvan Amiri [Tue, 6 Jun 2017 05:48:26 +0000 (22:48 -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
Bug: 62359697
Test: go/wm-smoke
Change-Id: Ida290e8babc83a998a55efd10d602eb7f05f3102

7 years agoMerge "Add back recents staggering entrance animation" 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

7 years agoMerge "Add back recents staggering entrance animation" into oc-dev
TreeHugger Robot [Tue, 6 Jun 2017 19:09:12 +0000 (19:09 +0000)]
Merge "Add back recents staggering entrance animation" into oc-dev

7 years agoMerge "QS: Remove listeners only if added" am: bede96729c
Gabriele M [Tue, 6 Jun 2017 19:00:21 +0000 (19:00 +0000)]
Merge "QS: Remove listeners only if added" am: bede96729c
am: a8e8f1c9f6

Change-Id: Id8211c9683230ee5cbf1bc7497f5e7d879116d56

7 years agoMerge "Don't show unset score values for AccessPoints." 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

7 years agoMerge "QS: Remove listeners only if added"
Gabriele M [Tue, 6 Jun 2017 18:49:15 +0000 (18:49 +0000)]
Merge "QS: Remove listeners only if added"
am: bede96729c

Change-Id: I53250273e39889b6b772dc12bbdbbc0c9606fd47

7 years agoMerge "Fix visibility issue in AccountManager.getAuthTokenByFeatures." into oc-dev
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

7 years agoMerge "Don't show unset score values for AccessPoints." into oc-dev
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

7 years agoMerge "QS: Remove listeners only if added"
Treehugger Robot [Tue, 6 Jun 2017 18:36:25 +0000 (18:36 +0000)]
Merge "QS: Remove listeners only if added"

7 years agoMerge "Fix visibility issue in AccountManager.getAuthTokenByFeatures." 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

7 years agoMerge "Don't allow removed DividerView to resize stack" 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

7 years agoMerge "Don't allow removed DividerView to resize stack" into oc-dev
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

7 years agoDon't show unset score values for AccessPoints.
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

7 years agoMerge "Refer to ShortcutManagerCompat in the javadoc" into oc-dev
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

7 years agoQS: Remove listeners only if added
Gabriele M [Mon, 5 Jun 2017 15:55:03 +0000 (17:55 +0200)]
QS: Remove listeners only if added

handleDestroy() calls setListening(false) unconditionally. This
causes an error if no listener was never added. Check if we added
a listener and then try to remove it.

Change-Id: Iefe8aacbe87ba1c2c19c9e77cf132fc7c84798f9

7 years agoMerge "Refer to ShortcutManagerCompat in the javadoc" into oc-dev
Makoto Onuki [Tue, 6 Jun 2017 16:26:05 +0000 (16:26 +0000)]
Merge "Refer to ShortcutManagerCompat in the javadoc" into oc-dev

7 years agoDon't allow removed DividerView to resize stack
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

7 years agoMerge "Give Doclava our manifest; more permission docs." into oc-dev
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

7 years agoMerge "Give Doclava our manifest; more permission docs." into oc-dev
Jeff Sharkey [Tue, 6 Jun 2017 15:19:19 +0000 (15:19 +0000)]
Merge "Give Doclava our manifest; more permission docs." into oc-dev

7 years agoRemove usages of ActionBarActivity.
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)

7 years agoAssociate freezing display with a target display id.
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

7 years agoMerge "WifiConfiguration: add local only networkId" into oc-dev
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

7 years agoMerge "WifiConfiguration: add local only networkId" into oc-dev
Rebecca Silberstein [Tue, 6 Jun 2017 14:42:54 +0000 (14:42 +0000)]
Merge "WifiConfiguration: add local only networkId" into oc-dev

7 years agoMerge "Coordinate configuration changes and window frame size." 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

7 years agoMerge "Coordinate configuration changes and window frame size." into oc-dev
Bryce Lee [Tue, 6 Jun 2017 14:26:28 +0000 (14:26 +0000)]
Merge "Coordinate configuration changes and window frame size." into oc-dev

7 years agoMerge "Added android.test.mock and android.test.mock.sdk targets" am: 46f8d427c4...
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

7 years agoMerge "Added android.test.mock and android.test.mock.sdk targets" am: 46f8d427c4
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

7 years agoMerge "Added android.test.mock and android.test.mock.sdk targets"
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

7 years agoMerge "Added android.test.mock and android.test.mock.sdk targets"
Paul Duffin [Tue, 6 Jun 2017 07:40:17 +0000 (07:40 +0000)]
Merge "Added android.test.mock and android.test.mock.sdk targets"

7 years agoMerge "Support setting upstream parameters." am: faf8d67749 am: 4e5024131b
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

7 years agoMerge "Support setting upstream parameters." am: faf8d67749
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

7 years agoMerge "Support setting upstream parameters."
Erik Kline [Tue, 6 Jun 2017 04:54:04 +0000 (04:54 +0000)]
Merge "Support setting upstream parameters."
am: faf8d67749

Change-Id: I0be9ad265fa664f0ce6e1e098996b46c88317b97

7 years agoMerge "Support setting upstream parameters."
Treehugger Robot [Tue, 6 Jun 2017 04:43:32 +0000 (04:43 +0000)]
Merge "Support setting upstream parameters."

7 years agoCoordinate configuration changes and window frame size.
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

7 years agoMerge "Revert "Disabled task snapshot for TV"" into oc-dev
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

7 years agoMerge "Revert "Disabled task snapshot for TV"" into oc-dev
Guang Zhu [Tue, 6 Jun 2017 03:29:05 +0000 (03:29 +0000)]
Merge "Revert "Disabled task snapshot for TV"" into oc-dev

7 years agoRevert "Disabled task snapshot for TV"
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

7 years agoSupport setting upstream parameters.
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

7 years agoMerge "Don't verify instant apps" into oc-dev
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

7 years agoMerge "Don't verify instant apps" into oc-dev
TreeHugger Robot [Tue, 6 Jun 2017 01:41:08 +0000 (01:41 +0000)]
Merge "Don't verify instant apps" into oc-dev

7 years agoFix #62350081 - annotate permission requirements
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

7 years agoMerge "Add ERI (enhanced roaming indicator) 66 to list of home ERIs for Verizon"...
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

7 years agoMerge "Add ERI (enhanced roaming indicator) 66 to list of home ERIs for Verizon"...
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

7 years agoMerge "Disabled task snapshot for TV" 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

7 years agoMerge "Reinstate SurfaceView Background from N" into oc-dev
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

7 years agoMerge "Disabled task snapshot for TV" into oc-dev
TreeHugger Robot [Tue, 6 Jun 2017 00:04:31 +0000 (00:04 +0000)]
Merge "Disabled task snapshot for TV" into oc-dev

7 years agoMerge "Reinstate SurfaceView Background from N" 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

7 years agoMerge "Fix icon tint on notification shelf" 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

7 years agoGive Doclava our manifest; more permission docs.
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

7 years agoMerge "Fix icon tint on notification shelf" into oc-dev
TreeHugger Robot [Mon, 5 Jun 2017 23:29:42 +0000 (23:29 +0000)]
Merge "Fix icon tint on notification shelf" into oc-dev

7 years agoMerge "Initialize last-orientation to ensure we don't skip loading config." into...
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

7 years agoMerge "Initialize last-orientation to ensure we don't skip loading config." into...
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

7 years agoMerge "Annotate @SystemApi with required permissions." 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

7 years agoMerge "Annotate @SystemApi with required permissions." into oc-dev
Jeff Sharkey [Mon, 5 Jun 2017 22:19:41 +0000 (22:19 +0000)]
Merge "Annotate @SystemApi with required permissions." into oc-dev

7 years agoMerge "Merge "Revert "Fix race condition triggered by quick stop/start of Dream"...
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

7 years agoMerge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw...
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

7 years agoMerge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw...
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

7 years agoMerge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw...
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

7 years agoMerge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw...
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

7 years agoMerge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw...
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

7 years agoMerge "Fix tinting of guest icon in QS footer" into oc-dev
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

7 years agoMerge "Ignore entries for isolated uids if there's no mapping for them." into oc-dev
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

7 years agoMerge "Fix tinting of guest icon in QS footer" into oc-dev
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

7 years agoMerge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw...
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

7 years agoMerge "Ignore entries for isolated uids if there's no mapping for them." into oc-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

7 years agoAdd back recents staggering entrance animation
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

7 years agoFix visibility issue in AccountManager.getAuthTokenByFeatures.
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

7 years agoMerge "Fix up some jank from unnecessary reinflation" into oc-dev
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

7 years agoMerge "Fix up some jank from unnecessary reinflation" into oc-dev
Jason Monk [Mon, 5 Jun 2017 19:50:06 +0000 (19:50 +0000)]
Merge "Fix up some jank from unnecessary reinflation" into oc-dev

7 years agoMerge "Added mising sendToTarget message for dismissing docked stack" 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

7 years agoAnnotate @SystemApi with required permissions.
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

7 years agoMerge "Added mising sendToTarget message for dismissing docked stack" into oc-dev
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

7 years agoMerge changes from topic 'dungeon' 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

7 years agoDisabled task snapshot for TV
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

7 years agoMerge changes from topic 'dungeon' into oc-dev
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.

7 years agoMerge "Remove ptp from persist config on boot" into oc-dev
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

7 years agoMerge "Remove ptp from persist config on boot" into oc-dev
Jerry Zhang [Mon, 5 Jun 2017 18:36:58 +0000 (18:36 +0000)]
Merge "Remove ptp from persist config on boot" into oc-dev