OSDN Git Service

android-x86/frameworks-base.git
7 years agoOnly show the "Disable eSIM" when eSIM profile is enabled
qingxi [Wed, 24 May 2017 22:33:13 +0000 (15:33 -0700)]
Only show the "Disable eSIM" when eSIM profile is enabled

Before this CL, we always show "Disable eSIM" button in SIM lock screen
if the device has eSIM chip. This may make the user who has never used
eSIM or currently is not activated the eSIM Profile confused. This CL
makes the "Disable eSIM" button only be shown iff the device has eSIM
chip and the current activated Profile is eSIM profile.

Bug: 37518023
Test: E2E
Change-Id: Id5a1325f49733528a370ec7145fe49731243bcf7

7 years agoMerge "Fix #62350081 - annotate permission requirements" into oc-dev am: 42abe82bbb
Christopher Tate [Tue, 6 Jun 2017 20:43:28 +0000 (20:43 +0000)]
Merge "Fix #62350081 - annotate permission requirements" into oc-dev am: 42abe82bbb
am: 169a884f81

Change-Id: I87140161d20185cd94a6b8b714ae90c5c5b9a773

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

Change-Id: Id8384736c70d82b9ef95e4cb805dde08f039dc04

7 years agoMerge "Change storage manager default to be a config."
Daniel Nishi [Tue, 6 Jun 2017 20:37:31 +0000 (20:37 +0000)]
Merge "Change storage manager default to be a config."

7 years agoMerge "Implement CacheManager for the Skia pipelines."
TreeHugger Robot [Tue, 6 Jun 2017 20:37:01 +0000 (20:37 +0000)]
Merge "Implement CacheManager for the Skia pipelines."

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 "Initial support for proposed android.net.lowpan"
TreeHugger Robot [Tue, 6 Jun 2017 20:25:47 +0000 (20:25 +0000)]
Merge "Initial support for proposed android.net.lowpan"

7 years agoMerge "[P2P] Add binder to service calls"
Etan Cohen [Tue, 6 Jun 2017 20:20:27 +0000 (20:20 +0000)]
Merge "[P2P] Add binder to service calls"

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 am: 1795242288
Bryce Lee [Tue, 6 Jun 2017 20:05:05 +0000 (20:05 +0000)]
Merge "Associate freezing display with a target display id." into oc-dev am: 1795242288
am: 2112d52636

Change-Id: I63bef7c4871117bd22bf552da696a20b889d27cb

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 "AAPT2: Allow <layout> in <activity> tag in AndroidManifest.xml"
TreeHugger Robot [Tue, 6 Jun 2017 19:49:47 +0000 (19:49 +0000)]
Merge "AAPT2: Allow <layout> in <activity> tag in AndroidManifest.xml"

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 agoMerge "Add back recents staggering entrance animation" into oc-dev am: 229119e06b
Matthew Ng [Tue, 6 Jun 2017 19:34:36 +0000 (19:34 +0000)]
Merge "Add back recents staggering entrance animation" into oc-dev am: 229119e06b
am: 9fb7f5f1dc

Change-Id: I5880e105b76bb567a6a1ab90301736a16e1c34c8

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 "Don't show unset score values for AccessPoints." into oc-dev am: 32c65fccaf
Sundeep Ghuman [Tue, 6 Jun 2017 19:03:10 +0000 (19:03 +0000)]
Merge "Don't show unset score values for AccessPoints." into oc-dev am: 32c65fccaf
am: 1e61697d3c  -s ours

Change-Id: I5b58c7052570ff8c6681bb19c8309e86a118425e

7 years agoMerge "Fix visibility issue in AccountManager.getAuthTokenByFeatures." into oc-dev...
Jian Sun [Tue, 6 Jun 2017 19:00:17 +0000 (19:00 +0000)]
Merge "Fix visibility issue in AccountManager.getAuthTokenByFeatures." into oc-dev am: f1946baae7
am: c3c3112806

Change-Id: I82589c5cf90d8dbb02bab757d58e8584bd05bdb8

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 "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 "Add SLOW network and remove deprecated enums."
TreeHugger Robot [Tue, 6 Jun 2017 18:41:48 +0000 (18:41 +0000)]
Merge "Add SLOW network and remove deprecated enums."

7 years agoNetworkCapabilities: Added support for TRANSPORT_LOWPAN
Robert Quattlebaum [Mon, 15 May 2017 22:53:29 +0000 (15:53 -0700)]
NetworkCapabilities: Added support for TRANSPORT_LOWPAN

This change simply adds a new constant, `TRANSPORT_LOWPAN`, for
identifying low-power wireless networks like Thread.

Bug: b/33073713
Change-Id: Ie4aa77496f8ff466fa1a5fbc556e9c029457a689

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 agoImplement CacheManager for the Skia pipelines.
Derek Sollenberger [Thu, 1 Jun 2017 17:07:39 +0000 (13:07 -0400)]
Implement CacheManager for the Skia pipelines.

The core of the implementation is complete and provides heuristic
cache sizing based on the size of the surface being used. This CL
will also be used to add the following features in the future...

1) Support Vulkan pipeline reporting on the size of the surface.
2) Complete the VectorDrawableAtlas stub code
3) Automatic purging of stale resources for low memory devices.

Test: hwui_unit_tests (new test added) and CtsUiRendering
Bug: 62260637
Change-Id: Ib85159cca28b646fe249f2190b07f1b7e0f50d8f

7 years agoAAPT2: Allow <layout> in <activity> tag in AndroidManifest.xml
Adam Lesinski [Fri, 2 Jun 2017 19:55:24 +0000 (12:55 -0700)]
AAPT2: Allow <layout> in <activity> tag in AndroidManifest.xml

Bug: 62189611
Test: make AaptTestAppOne
Change-Id: Ic090e4a002b24f2289f47dfba7439638e5848062

7 years agoMerge "Don't allow removed DividerView to resize stack" into oc-dev am: d7427d5d90
Wale Ogunwale [Tue, 6 Jun 2017 18:08:49 +0000 (18:08 +0000)]
Merge "Don't allow removed DividerView to resize stack" into oc-dev am: d7427d5d90
am: b4f383c26e

Change-Id: Ibded63bebba40bc29978dee2717dd61a36d609a9

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 ago[P2P] Add binder to service calls
Etan Cohen [Thu, 25 May 2017 18:06:40 +0000 (11:06 -0700)]
[P2P] Add binder to service calls

Bug: 33040182
Test: unit tests, run-time behavior
Change-Id: Ic383efc858bb4454d99c98ab24365c63ad3e7f54

7 years agoMerge "Add logging metrics for ConfigureKeyGuardDialog"
TreeHugger Robot [Tue, 6 Jun 2017 17:17:05 +0000 (17:17 +0000)]
Merge "Add logging metrics for ConfigureKeyGuardDialog"

7 years agoMerge "new strings to support vzw roaming feature"
Chen Xu [Tue, 6 Jun 2017 17:14:05 +0000 (17:14 +0000)]
Merge "new strings to support vzw roaming feature"

7 years agoMerge "Refer to ShortcutManagerCompat in the javadoc" into oc-dev am: a9c185f6e7
Makoto Onuki [Tue, 6 Jun 2017 17:00:17 +0000 (17:00 +0000)]
Merge "Refer to ShortcutManagerCompat in the javadoc" into oc-dev am: a9c185f6e7
am: a178d194f9

Change-Id: Iec712211a2c83798ae160560d1cca9ce23b7e577

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 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 agoMerge "Give Doclava our manifest; more permission docs." into oc-dev am: 65d4cbba37
Jeff Sharkey [Tue, 6 Jun 2017 16:17:39 +0000 (16:17 +0000)]
Merge "Give Doclava our manifest; more permission docs." into oc-dev am: 65d4cbba37
am: 67cb5f5210

Change-Id: Ic4c30cdb8bbfda5b3703eb3c7c36c1bf8ab3a216

7 years agoMerge "Merge "WifiConfiguration: add local only networkId" into oc-dev am: 46f4d5c4a6...
Android Build Merger (Role) [Tue, 6 Jun 2017 16:12:50 +0000 (16:12 +0000)]
Merge "Merge "WifiConfiguration: add local only networkId" into oc-dev am: 46f4d5c4a6 am: 0ffff6a341"

7 years agoMerge "WifiConfiguration: add local only networkId" into oc-dev am: 46f4d5c4a6
Rebecca Silberstein [Tue, 6 Jun 2017 16:11:46 +0000 (16:11 +0000)]
Merge "WifiConfiguration: add local only networkId" into oc-dev am: 46f4d5c4a6
am: 0ffff6a341

Change-Id: I84c310c491dff17f193e8e7942c2ba90798e65b9

7 years agoMerge "Merge "Coordinate configuration changes and window frame size." into oc-dev...
Android Build Merger (Role) [Tue, 6 Jun 2017 16:11:16 +0000 (16:11 +0000)]
Merge "Merge "Coordinate configuration changes and window frame size." into oc-dev am: 749cbb1911 am: 42e95f8b54"

7 years agoMerge "Coordinate configuration changes and window frame size." into oc-dev am: 749cb...
Bryce Lee [Tue, 6 Jun 2017 16:10:17 +0000 (16:10 +0000)]
Merge "Coordinate configuration changes and window frame size." into oc-dev am: 749cbb1911
am: 42e95f8b54

Change-Id: I6ecf592612f5c9d54c37ae9df9525b2f9e14826d

7 years agoMerge "Merge "Added android.test.mock and android.test.mock.sdk targets" am: 46f8d427...
Android Build Merger (Role) [Tue, 6 Jun 2017 16:09:49 +0000 (16:09 +0000)]
Merge "Merge "Added android.test.mock and android.test.mock.sdk targets" am: 46f8d427c4 am: de30ee2d40 am: e468747115 am: 2fa69bdfce  -s ours"

7 years agoMerge "Added android.test.mock and android.test.mock.sdk targets" am: 46f8d427c4...
Paul Duffin [Tue, 6 Jun 2017 16:08:43 +0000 (16:08 +0000)]
Merge "Added android.test.mock and android.test.mock.sdk targets" am: 46f8d427c4 am: de30ee2d40 am: e468747115
am: 2fa69bdfce  -s ours

Change-Id: I2559922e3e55d0b64dea38646836fe3ab8ee7fd0

7 years agoMerge "Merge "Support setting upstream parameters." am: faf8d67749 am: 4e5024131b...
Android Build Merger (Role) [Tue, 6 Jun 2017 16:07:55 +0000 (16:07 +0000)]
Merge "Merge "Support setting upstream parameters." am: faf8d67749 am: 4e5024131b am: e2018a407a am: 6ce08f623c"

7 years agoMerge "Support setting upstream parameters." am: faf8d67749 am: 4e5024131b am: e2018a407a
Erik Kline [Tue, 6 Jun 2017 16:06:43 +0000 (16:06 +0000)]
Merge "Support setting upstream parameters." am: faf8d67749 am: 4e5024131b am: e2018a407a
am: 6ce08f623c

Change-Id: Ia290ef28f466d6a5c3f7208b1bc078bd7a2c204a

7 years agoMerge "Merge "Revert "Disabled task snapshot for TV"" into oc-dev am: faf86491e9...
Android Build Merger (Role) [Tue, 6 Jun 2017 16:06:12 +0000 (16:06 +0000)]
Merge "Merge "Revert "Disabled task snapshot for TV"" into oc-dev am: faf86491e9 am: 8212cdfb40"

7 years agoMerge "Revert "Disabled task snapshot for TV"" into oc-dev am: faf86491e9
Guang Zhu [Tue, 6 Jun 2017 16:05:04 +0000 (16:05 +0000)]
Merge "Revert "Disabled task snapshot for TV"" into oc-dev am: faf86491e9
am: 8212cdfb40

Change-Id: I421c7bd88c694f569b267e25bf7e7428a4e9d300

7 years agoMerge "Merge "Don't verify instant apps" into oc-dev am: 9bac79a540 am: 27eb2e2b5b"
Android Build Merger (Role) [Tue, 6 Jun 2017 16:04:32 +0000 (16:04 +0000)]
Merge "Merge "Don't verify instant apps" into oc-dev am: 9bac79a540 am: 27eb2e2b5b"

7 years agoMerge "Don't verify instant apps" into oc-dev am: 9bac79a540
Todd Kennedy [Tue, 6 Jun 2017 16:03:31 +0000 (16:03 +0000)]
Merge "Don't verify instant apps" into oc-dev am: 9bac79a540
am: 27eb2e2b5b

Change-Id: I65b0a71e71620ec280aba8ee53f54c99d2a56352

7 years agoMerge "Merge "Add ERI (enhanced roaming indicator) 66 to list of home ERIs for Verizo...
Android Build Merger (Role) [Tue, 6 Jun 2017 16:03:02 +0000 (16:03 +0000)]
Merge "Merge "Add ERI (enhanced roaming indicator) 66 to list of home ERIs for Verizon" into oc-dev am: 4deefdbe7a am: 39c23689dd"

7 years agoMerge "Revert "Revert "power hal: Use power HAL API 1.1"""
Ahmed ElArabawy [Tue, 6 Jun 2017 16:01:48 +0000 (16:01 +0000)]
Merge "Revert "Revert "power hal: Use power HAL API 1.1"""

7 years agoMerge "Add ERI (enhanced roaming indicator) 66 to list of home ERIs for Verizon"...
Jayachandran C [Tue, 6 Jun 2017 16:01:01 +0000 (16:01 +0000)]
Merge "Add ERI (enhanced roaming indicator) 66 to list of home ERIs for Verizon" into oc-dev am: 4deefdbe7a
am: 39c23689dd

Change-Id: I7a4b53fe0a2d2a5a84b43dec9ed34a40fd3f42c7

7 years agoMerge "Disabled task snapshot for TV" into oc-dev am: 4cddd9a723
Keyvan Amiri [Tue, 6 Jun 2017 15:58:43 +0000 (15:58 +0000)]
Merge "Disabled task snapshot for TV" into oc-dev am: 4cddd9a723
am: 1d3a419358

Change-Id: Idf75e8b7871c6e89ef3dbccf917dd54d3e8575bf

7 years agoMerge "Reinstate SurfaceView Background from N" into oc-dev am: 71044d6ba1
Robert Carr [Tue, 6 Jun 2017 15:56:31 +0000 (15:56 +0000)]
Merge "Reinstate SurfaceView Background from N" into oc-dev am: 71044d6ba1
am: 6f0f995120

Change-Id: I69cf4465b8900abea6e4e803b0d2c1cd033a0635

7 years agoMerge "Fix icon tint on notification shelf" into oc-dev am: 285ad4ce66
Lucas Dupin [Tue, 6 Jun 2017 15:54:15 +0000 (15:54 +0000)]
Merge "Fix icon tint on notification shelf" into oc-dev am: 285ad4ce66
am: 6b5b7c4d31

Change-Id: I286f4e0881d225a859f465e37a60944fb4427828

7 years agoMerge "Initialize last-orientation to ensure we don't skip loading config." into...
Winson Chung [Tue, 6 Jun 2017 15:52:06 +0000 (15:52 +0000)]
Merge "Initialize last-orientation to ensure we don't skip loading config." into oc-dev am: 5fc8f7d08a
am: 13ec0f2bba

Change-Id: I2deb72fbeb7862ce2b6f0a713e2bc4ac45dcff80

7 years agoMerge "Annotate @SystemApi with required permissions." into oc-dev am: c1406978a4
Jeff Sharkey [Tue, 6 Jun 2017 15:48:24 +0000 (15:48 +0000)]
Merge "Annotate @SystemApi with required permissions." into oc-dev am: c1406978a4
am: 7a2e4a8486

Change-Id: Ib629e25dbf047c110feaf03e4ff744b5c6df9aeb

7 years agoMerge "Merge "Revert "Fix race condition triggered by quick stop/start of Dream"...
Erik Wolsheimer [Tue, 6 Jun 2017 15:43:39 +0000 (15:43 +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
am: c382355cc1

Change-Id: Iffb0d2b3bdc8cc5f4c1b3cbd43b3519156fdcd2b

7 years agoMerge "Remove unused variable 'screenon'"
Siarhei Vishniakou [Tue, 6 Jun 2017 15:39:50 +0000 (15:39 +0000)]
Merge "Remove unused variable 'screenon'"

7 years agoMerge "Remove unused function"
Siarhei Vishniakou [Tue, 6 Jun 2017 15:38:27 +0000 (15:38 +0000)]
Merge "Remove unused function"

7 years agoMerge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw...
Erik Wolsheimer [Tue, 6 Jun 2017 15:35:06 +0000 (15:35 +0000)]
Merge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw-f-dev am: 7a5dd1c3ff am: 51a89ee90c am: 2c5e537e6c
am: dae13a0990

Change-Id: I39b2f960b584ee2fced3d3411dae57f1afd5aa37

7 years agoMerge "Fix tinting of guest icon in QS footer" into oc-dev am: 8490ed92e1
Jason Monk [Tue, 6 Jun 2017 15:33:05 +0000 (15:33 +0000)]
Merge "Fix tinting of guest icon in QS footer" into oc-dev am: 8490ed92e1
am: 7be40072c2

Change-Id: I20c7c45606a2206241314914beee168f3129e4c3

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 "Ignore entries for isolated uids if there's no mapping for them." into oc...
Sudheer Shanka [Tue, 6 Jun 2017 15:31:17 +0000 (15:31 +0000)]
Merge "Ignore entries for isolated uids if there's no mapping for them." into oc-dev am: 057bad9c9d
am: cefa28dc8a

Change-Id: I0dac209a9a5af6f5b83ea0d9706a29e5f6a97df4

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 "Fix up some jank from unnecessary reinflation" into oc-dev am: f6e2099063
Jason Monk [Tue, 6 Jun 2017 15:28:19 +0000 (15:28 +0000)]
Merge "Fix up some jank from unnecessary reinflation" into oc-dev am: f6e2099063
am: 2638ae16e2

Change-Id: I7101f1442145ef41008a7e890e811df8db2a7e50

7 years agoMerge "Added mising sendToTarget message for dismissing docked stack" into oc-dev...
Wale Ogunwale [Tue, 6 Jun 2017 15:25:32 +0000 (15:25 +0000)]
Merge "Added mising sendToTarget message for dismissing docked stack" into oc-dev am: 6cc151468b
am: 619c81b5a8

Change-Id: I03e6f2b0b07bfa8330063d6884e7a4c3ef68fa76

7 years agoMerge changes from topic 'dungeon' into oc-dev am: 36a673a7d7
Daniel Sandler [Tue, 6 Jun 2017 15:22:29 +0000 (15:22 +0000)]
Merge changes from topic 'dungeon' into oc-dev am: 36a673a7d7
am: 7574fbee46  -s ours

Change-Id: I399952bd642c22f342bc62a2b50016ff754f8b50

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 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 "Fix failing ActionBarContainerTest#testFloatingActionModesAreBubbledUp"
TreeHugger Robot [Tue, 6 Jun 2017 09:59:54 +0000 (09:59 +0000)]
Merge "Fix failing ActionBarContainerTest#testFloatingActionModesAreBubbledUp"

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 agoAdd logging metrics for ConfigureKeyGuardDialog
fanzhang172 [Tue, 6 Jun 2017 04:43:47 +0000 (21:43 -0700)]
Add logging metrics for ConfigureKeyGuardDialog

Bug: 62115677
Test: builds
Change-Id: Ibe46a979b21fe847f543766083fac32f124cfac8

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 agoAdd SLOW network and remove deprecated enums.
Sundeep Ghuman [Mon, 5 Jun 2017 23:46:59 +0000 (16:46 -0700)]
Add SLOW network and remove deprecated enums.

Stop using deprecated API enums and instead define internal constants
for different network speeds. Add support for 'SLOW' networks.

Bug: b/35628911
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java

Change-Id: I3394f801118adffcb4ba49035e0b22eebb9f0e9a

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 a new Bluetooth device details page"
TreeHugger Robot [Tue, 6 Jun 2017 01:29:18 +0000 (01:29 +0000)]
Merge "Add a new Bluetooth device details page"

7 years agoMerge "Move underline thickness and position computation to Paint"
TreeHugger Robot [Tue, 6 Jun 2017 01:05:38 +0000 (01:05 +0000)]
Merge "Move underline thickness and position computation to Paint"

7 years agoMerge "Enable speed labeling based on existing network badges."
TreeHugger Robot [Tue, 6 Jun 2017 00:47:00 +0000 (00:47 +0000)]
Merge "Enable speed labeling based on existing network badges."

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