OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Fix #62545908 : 'metered' network jobs run without network" into oc-dev am...
Christopher Tate [Tue, 13 Jun 2017 23:44:45 +0000 (23:44 +0000)]
Merge "Fix #62545908 : 'metered' network jobs run without network" into oc-dev am: 796b510787
am: 85c9638438

Change-Id: Icc9968bcbee5fb029a4fea4368ac57fc7bc6c71d

7 years agoMerge "Use UiContext with StrictMode Dialog" into oc-dev am: 9274d87a0e
Adam Lesinski [Tue, 13 Jun 2017 23:43:08 +0000 (23:43 +0000)]
Merge "Use UiContext with StrictMode Dialog" into oc-dev am: 9274d87a0e
am: e9a4951c4d

Change-Id: I8093fff1e13490be07b62537bbfdfd064102bb46

7 years agoMerge "Fix #62545908 : 'metered' network jobs run without network" into oc-dev
Christopher Tate [Tue, 13 Jun 2017 23:34:51 +0000 (23:34 +0000)]
Merge "Fix #62545908 : 'metered' network jobs run without network" into oc-dev
am: 796b510787

Change-Id: I8c87bb6ac0ed8867ffd36a6fe1692bfb933bf746

7 years agoMerge "Use UiContext with StrictMode Dialog" into oc-dev
Adam Lesinski [Tue, 13 Jun 2017 23:32:22 +0000 (23:32 +0000)]
Merge "Use UiContext with StrictMode Dialog" into oc-dev
am: 9274d87a0e

Change-Id: I1b62c2f6aeb7d7167a6bbf1e4b09124914c7936e

7 years agoMerge "Fix #62545908 : 'metered' network jobs run without network" into oc-dev
TreeHugger Robot [Tue, 13 Jun 2017 23:27:10 +0000 (23:27 +0000)]
Merge "Fix #62545908 : 'metered' network jobs run without network" into oc-dev

7 years agoMerge "Use UiContext with StrictMode Dialog" into oc-dev
TreeHugger Robot [Tue, 13 Jun 2017 23:16:58 +0000 (23:16 +0000)]
Merge "Use UiContext with StrictMode Dialog" into oc-dev

7 years agoMerge "Merge "Boost the anim thread priority when doing a bounds animation." into...
Android Build Merger (Role) [Tue, 13 Jun 2017 23:04:29 +0000 (23:04 +0000)]
Merge "Merge "Boost the anim thread priority when doing a bounds animation." into oc-dev am: 167f0001b8 am: 8b5b0c2bfa" into oc-dr1-dev-plus-aosp

7 years agoMerge "Boost the anim thread priority when doing a bounds animation." into oc-dev...
Winson Chung [Tue, 13 Jun 2017 23:03:35 +0000 (23:03 +0000)]
Merge "Boost the anim thread priority when doing a bounds animation." into oc-dev am: 167f0001b8
am: 8b5b0c2bfa

Change-Id: If68611d32998af58c6d59825b27e679783a9109c

7 years agoMerge "Merge "Increases TC Logging Visibility for testing" into oc-dr1-dev am: f69a9c...
Android Build Merger (Role) [Tue, 13 Jun 2017 23:03:10 +0000 (23:03 +0000)]
Merge "Merge "Increases TC Logging Visibility for testing" into oc-dr1-dev am: f69a9c9dc6" into oc-dr1-dev-plus-aosp

7 years agoMerge "Increases TC Logging Visibility for testing" into oc-dr1-dev
Brad Ebinger [Tue, 13 Jun 2017 23:01:49 +0000 (23:01 +0000)]
Merge "Increases TC Logging Visibility for testing" into oc-dr1-dev
am: f69a9c9dc6

Change-Id: Ia53392e722399e33720d3a11d7bee5f18661f862

7 years agoMerge "Boost the anim thread priority when doing a bounds animation." into oc-dev...
Winson Chung [Tue, 13 Jun 2017 23:00:15 +0000 (23:00 +0000)]
Merge "Boost the anim thread priority when doing a bounds animation." into oc-dev am: 167f0001b8
am: 3609f00c42

Change-Id: I3d99f5bc6eebeb4cecf9d479b81a287aebabdb7f

7 years agoMerge "Boost the anim thread priority when doing a bounds animation." into oc-dev
Winson Chung [Tue, 13 Jun 2017 22:55:00 +0000 (22:55 +0000)]
Merge "Boost the anim thread priority when doing a bounds animation." into oc-dev
am: 167f0001b8

Change-Id: Ie180c311af24be6067ebf8cd24c6c1958dfe0c39

7 years agoMerge "Boost the anim thread priority when doing a bounds animation." into oc-dev
Winson Chung [Tue, 13 Jun 2017 22:53:09 +0000 (22:53 +0000)]
Merge "Boost the anim thread priority when doing a bounds animation." into oc-dev
am: 167f0001b8

Change-Id: I4f54c90c54fd81bd399a0198d48ab597feaba217

7 years agoMerge "Increases TC Logging Visibility for testing" into oc-dr1-dev
Brad Ebinger [Tue, 13 Jun 2017 22:51:28 +0000 (22:51 +0000)]
Merge "Increases TC Logging Visibility for testing" into oc-dr1-dev

7 years agoMerge "Merge "Save overlay paths as user state" into oc-dev am: 508a5bade6 am: b692f4...
Android Build Merger (Role) [Tue, 13 Jun 2017 22:50:04 +0000 (22:50 +0000)]
Merge "Merge "Save overlay paths as user state" into oc-dev am: 508a5bade6 am: b692f4a095" into oc-dr1-dev-plus-aosp

7 years agoMerge "Save overlay paths as user state" into oc-dev am: 508a5bade6
Todd Kennedy [Tue, 13 Jun 2017 22:46:41 +0000 (22:46 +0000)]
Merge "Save overlay paths as user state" into oc-dev am: 508a5bade6
am: 80b761b6db

Change-Id: I0a2f3b0318b75bd08b8dfa1db1658930617333c1

7 years agoMerge "Save overlay paths as user state" into oc-dev am: 508a5bade6
Todd Kennedy [Tue, 13 Jun 2017 22:46:33 +0000 (22:46 +0000)]
Merge "Save overlay paths as user state" into oc-dev am: 508a5bade6
am: b692f4a095

Change-Id: I7b3a9b1f543391b50aa63c0c98e166bd58fbc37c

7 years agoMerge "Boost the anim thread priority when doing a bounds animation." into oc-dev
TreeHugger Robot [Tue, 13 Jun 2017 22:43:46 +0000 (22:43 +0000)]
Merge "Boost the anim thread priority when doing a bounds animation." into oc-dev

7 years agoMerge "Save overlay paths as user state" into oc-dev
Todd Kennedy [Tue, 13 Jun 2017 22:39:56 +0000 (22:39 +0000)]
Merge "Save overlay paths as user state" into oc-dev
am: 508a5bade6

Change-Id: Icba76fbeef9f4cd2a067fafd65c750f1f95a4ed0

7 years agoMerge "Save overlay paths as user state" into oc-dev
Todd Kennedy [Tue, 13 Jun 2017 22:39:40 +0000 (22:39 +0000)]
Merge "Save overlay paths as user state" into oc-dev
am: 508a5bade6

Change-Id: If46b58323883dcdeef72f0a394f79becca134c23

7 years agoMerge "Save overlay paths as user state" into oc-dev
TreeHugger Robot [Tue, 13 Jun 2017 22:31:36 +0000 (22:31 +0000)]
Merge "Save overlay paths as user state" into oc-dev

7 years agoMerge "Do not CloseGuard KernelID or FieldID" am: 6b70eafae1 am: d25acf1022
Yang Ni [Tue, 13 Jun 2017 22:29:12 +0000 (22:29 +0000)]
Merge "Do not CloseGuard KernelID or FieldID" am: 6b70eafae1 am: d25acf1022
am: 1b74e324f6

Change-Id: I1220dcc0ee27b8ba5650bf78cf9e8574b16e3486

7 years agoMerge "Added a category for lockscreen settings." into oc-dr1-dev
Katsiaryna Naliuka [Tue, 13 Jun 2017 22:23:23 +0000 (22:23 +0000)]
Merge "Added a category for lockscreen settings." into oc-dr1-dev
am: 7cb007c6d3

Change-Id: Ifd60b2b309fe7e251c13844ef5473bad1a73c757

7 years agoMerge "Do not CloseGuard KernelID or FieldID" am: 6b70eafae1
Yang Ni [Tue, 13 Jun 2017 22:18:51 +0000 (22:18 +0000)]
Merge "Do not CloseGuard KernelID or FieldID" am: 6b70eafae1
am: d25acf1022

Change-Id: I900b48f94fdbdd1f502de36e3f121f472ea1daf8

7 years agoMerge "Added a category for lockscreen settings." into oc-dr1-dev
Katsiaryna Naliuka [Tue, 13 Jun 2017 22:15:33 +0000 (22:15 +0000)]
Merge "Added a category for lockscreen settings." into oc-dr1-dev

7 years agoMerge "Merge "Fix issue #62390590: SecurityException in JobIntentService$..." into...
Android Build Merger (Role) [Tue, 13 Jun 2017 22:11:07 +0000 (22:11 +0000)]
Merge "Merge "Fix issue #62390590:  SecurityException in JobIntentService$..." into oc-dev am: 69c3a1d45a am: 22bdb8b88a" into oc-dr1-dev-plus-aosp

7 years agoMerge "Fix issue #62390590: SecurityException in JobIntentService$..." into oc-dev...
Dianne Hackborn [Tue, 13 Jun 2017 22:09:45 +0000 (22:09 +0000)]
Merge "Fix issue #62390590:  SecurityException in JobIntentService$..." into oc-dev am: 69c3a1d45a
am: 22bdb8b88a

Change-Id: I7ad0c7bcc4bd6ac780bbff2fa7ac3380ea3031b3

7 years agoMerge "Fix issue #62390590: SecurityException in JobIntentService$..." into oc-dev...
Dianne Hackborn [Tue, 13 Jun 2017 22:08:38 +0000 (22:08 +0000)]
Merge "Fix issue #62390590:  SecurityException in JobIntentService$..." into oc-dev am: 69c3a1d45a
am: 1e41816eb0

Change-Id: I60aadf3d73de86b4e83dc0fa228e1ac9a21db86f

7 years agoMerge "Do not CloseGuard KernelID or FieldID"
Yang Ni [Tue, 13 Jun 2017 22:08:06 +0000 (22:08 +0000)]
Merge "Do not CloseGuard KernelID or FieldID"
am: 6b70eafae1

Change-Id: I89390175e3404489991e599a74034e559a527435

7 years agoMerge "Send ACTION_SHUTDOWN broadcast to manifest receivers" into oc-dev am: 630a49aa4e
Christopher Tate [Tue, 13 Jun 2017 22:04:09 +0000 (22:04 +0000)]
Merge "Send ACTION_SHUTDOWN broadcast to manifest receivers" into oc-dev am: 630a49aa4e
am: 2e135c25a4

Change-Id: Ic991aac29d91f82aefe2d5a1a0e1b9d1b370ab9b

7 years agoMerge "Fix issue #62390590: SecurityException in JobIntentService$..." into oc-dev
Dianne Hackborn [Tue, 13 Jun 2017 21:59:47 +0000 (21:59 +0000)]
Merge "Fix issue #62390590:  SecurityException in JobIntentService$..." into oc-dev
am: 69c3a1d45a

Change-Id: I71017d8fd6efee24d437f66b2c5be34068bd3dfc

7 years agoMerge "Merge "Send ACTION_SHUTDOWN broadcast to manifest receivers" into oc-dev am...
Android Build Merger (Role) [Tue, 13 Jun 2017 21:59:22 +0000 (21:59 +0000)]
Merge "Merge "Send ACTION_SHUTDOWN broadcast to manifest receivers" into oc-dev am: 630a49aa4e am: f03738d877" into oc-dr1-dev-plus-aosp

7 years agoMerge "Send ACTION_SHUTDOWN broadcast to manifest receivers" into oc-dev am: 630a49aa4e
Christopher Tate [Tue, 13 Jun 2017 21:58:06 +0000 (21:58 +0000)]
Merge "Send ACTION_SHUTDOWN broadcast to manifest receivers" into oc-dev am: 630a49aa4e
am: f03738d877

Change-Id: I7738d29f74995122533b16ecb82819f125a9bdd9

7 years agoMerge "Fix issue #62390590: SecurityException in JobIntentService$..." into oc-dev
Dianne Hackborn [Tue, 13 Jun 2017 21:57:33 +0000 (21:57 +0000)]
Merge "Fix issue #62390590:  SecurityException in JobIntentService$..." into oc-dev
am: 69c3a1d45a

Change-Id: Iff54638e534562f573b0dc4af26d66e203867d1d

7 years agoMerge "Merge "Fix sysui depending on slow bt calls" into oc-dev am: 02d5b79cf6 am...
Android Build Merger (Role) [Tue, 13 Jun 2017 21:57:21 +0000 (21:57 +0000)]
Merge "Merge "Fix sysui depending on slow bt calls" into oc-dev am: 02d5b79cf6 am: 304f3a74be" into oc-dr1-dev-plus-aosp

7 years agoMerge "Fix sysui depending on slow bt calls" into oc-dev am: 02d5b79cf6
Jason Monk [Tue, 13 Jun 2017 21:55:11 +0000 (21:55 +0000)]
Merge "Fix sysui depending on slow bt calls" into oc-dev am: 02d5b79cf6
am: 4764f7b5b5

Change-Id: I794a40787c56048b1b0af502470621ff799a1eef

7 years agoMerge "Fix sysui depending on slow bt calls" into oc-dev am: 02d5b79cf6
Jason Monk [Tue, 13 Jun 2017 21:54:34 +0000 (21:54 +0000)]
Merge "Fix sysui depending on slow bt calls" into oc-dev am: 02d5b79cf6
am: 304f3a74be

Change-Id: I2d863f2db0576b04fbbcec0c81fffb354833af1c

7 years agoMerge "Fix issue #62390590: SecurityException in JobIntentService$..." into oc-dev
TreeHugger Robot [Tue, 13 Jun 2017 21:51:46 +0000 (21:51 +0000)]
Merge "Fix issue #62390590:  SecurityException in JobIntentService$..." into oc-dev

7 years agoMerge "Do not CloseGuard KernelID or FieldID"
Treehugger Robot [Tue, 13 Jun 2017 21:49:46 +0000 (21:49 +0000)]
Merge "Do not CloseGuard KernelID or FieldID"

7 years agoMerge "Send ACTION_SHUTDOWN broadcast to manifest receivers" into oc-dev
Christopher Tate [Tue, 13 Jun 2017 21:47:20 +0000 (21:47 +0000)]
Merge "Send ACTION_SHUTDOWN broadcast to manifest receivers" into oc-dev
am: 630a49aa4e

Change-Id: I2fc48a0117c021ed415ecb06efffb2e41ce567a1

7 years agoMerge "Send ACTION_SHUTDOWN broadcast to manifest receivers" into oc-dev
Christopher Tate [Tue, 13 Jun 2017 21:47:03 +0000 (21:47 +0000)]
Merge "Send ACTION_SHUTDOWN broadcast to manifest receivers" into oc-dev
am: 630a49aa4e

Change-Id: Ib2a4229a6b00810b9dd73733421f3ac7e57f2112

7 years agoMerge "Fix sysui depending on slow bt calls" into oc-dev
Jason Monk [Tue, 13 Jun 2017 21:44:03 +0000 (21:44 +0000)]
Merge "Fix sysui depending on slow bt calls" into oc-dev
am: 02d5b79cf6

Change-Id: I9a1dbc2f382562fb8ced63fd70f1a5e1674285f0

7 years agoMerge "Fix sysui depending on slow bt calls" into oc-dev
Jason Monk [Tue, 13 Jun 2017 21:43:35 +0000 (21:43 +0000)]
Merge "Fix sysui depending on slow bt calls" into oc-dev
am: 02d5b79cf6

Change-Id: If250b772445628e26fd73d0c81f31ea89e74f7fa

7 years agoMerge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev am...
Chad Brubaker [Tue, 13 Jun 2017 21:40:44 +0000 (21:40 +0000)]
Merge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev am: 4a0ea3e88f
am: bfd7cc4dbb

Change-Id: Ia50be57d9203381f39c739dddd3b52a35b761cea

7 years agoMerge "Send ACTION_SHUTDOWN broadcast to manifest receivers" into oc-dev
TreeHugger Robot [Tue, 13 Jun 2017 21:36:45 +0000 (21:36 +0000)]
Merge "Send ACTION_SHUTDOWN broadcast to manifest receivers" into oc-dev

7 years agoMerge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev am...
Chad Brubaker [Tue, 13 Jun 2017 21:36:27 +0000 (21:36 +0000)]
Merge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev am: 4a0ea3e88f
am: 6d1b84bc3f

Change-Id: I6e307ac5b38732d69d6eeeed7fa155db3d215fe1

7 years agoMerge "Fix sysui depending on slow bt calls" into oc-dev
TreeHugger Robot [Tue, 13 Jun 2017 21:32:28 +0000 (21:32 +0000)]
Merge "Fix sysui depending on slow bt calls" into oc-dev

7 years agoMerge "Change SlashDrawable semantics to fix QS crash" into oc-dr1-dev
Evan Laird [Tue, 13 Jun 2017 21:30:58 +0000 (21:30 +0000)]
Merge "Change SlashDrawable semantics to fix QS crash" into oc-dr1-dev
am: 70cb08326e

Change-Id: I18d0e0af532749e7b6fcf60a69e1dfd81b70c2d9

7 years agoMerge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev
Chad Brubaker [Tue, 13 Jun 2017 21:29:45 +0000 (21:29 +0000)]
Merge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev
am: 4a0ea3e88f

Change-Id: Id7b7326f819c9e0389c3ad9db2863e72ec716f83

7 years agoMerge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev
Chad Brubaker [Tue, 13 Jun 2017 21:28:37 +0000 (21:28 +0000)]
Merge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev
am: 4a0ea3e88f

Change-Id: I5dcc03662ab5babbfc5559257b1ecdf9568c9d49

7 years agoMerge "Merge "Binder: Add more logging on Error" into oc-dev am: ab934ae8e6 am: 807c9...
Android Build Merger (Role) [Tue, 13 Jun 2017 21:27:11 +0000 (21:27 +0000)]
Merge "Merge "Binder: Add more logging on Error" into oc-dev am: ab934ae8e6 am: 807c9ae55f" into oc-dr1-dev-plus-aosp

7 years agoMerge "Binder: Add more logging on Error" into oc-dev am: ab934ae8e6
Andreas Gampe [Tue, 13 Jun 2017 21:24:03 +0000 (21:24 +0000)]
Merge "Binder: Add more logging on Error" into oc-dev am: ab934ae8e6
am: 807c9ae55f

Change-Id: I510c04b8628453f37ce6098573e23e7c3e4bc29e

7 years agoMerge "Binder: Add more logging on Error" into oc-dev am: ab934ae8e6
Andreas Gampe [Tue, 13 Jun 2017 21:23:05 +0000 (21:23 +0000)]
Merge "Binder: Add more logging on Error" into oc-dev am: ab934ae8e6
am: 8767655272

Change-Id: I5c77433743214db21d5d3f2992430ec8bbab7151

7 years agoMerge "Change SlashDrawable semantics to fix QS crash" into oc-dr1-dev
TreeHugger Robot [Tue, 13 Jun 2017 21:19:14 +0000 (21:19 +0000)]
Merge "Change SlashDrawable semantics to fix QS crash" into oc-dr1-dev

7 years agoMerge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev
Chad Brubaker [Tue, 13 Jun 2017 21:18:23 +0000 (21:18 +0000)]
Merge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev

7 years agoUse UiContext with StrictMode Dialog
Adam Lesinski [Tue, 13 Jun 2017 21:15:19 +0000 (14:15 -0700)]
Use UiContext with StrictMode Dialog

Bug: 62382723
Test: manual
Change-Id: I5cb5ac5de0800b31d0dad7698f9229873ff83e27

7 years agoMerge "Binder: Add more logging on Error" into oc-dev
Andreas Gampe [Tue, 13 Jun 2017 21:14:52 +0000 (21:14 +0000)]
Merge "Binder: Add more logging on Error" into oc-dev
am: ab934ae8e6

Change-Id: I6e320f34429c82ece01a946ecda96cf17252a701

7 years agoMerge "Binder: Add more logging on Error" into oc-dev
Andreas Gampe [Tue, 13 Jun 2017 21:12:33 +0000 (21:12 +0000)]
Merge "Binder: Add more logging on Error" into oc-dev
am: ab934ae8e6

Change-Id: I7cdc522995f3b10d70cd6dced7dd4850eb542c71

7 years agoMerge "Add updateMethod callback" am: a0974dbc0f am: 7791ac2e28
Robert Greenwalt [Tue, 13 Jun 2017 21:11:43 +0000 (21:11 +0000)]
Merge "Add updateMethod callback" am: a0974dbc0f am: 7791ac2e28
am: 01712b1aa6

Change-Id: I4b5b26081030f71e90022495e7a5cbb7811e5974

7 years agoFix #62545908 : 'metered' network jobs run without network
Christopher Tate [Tue, 13 Jun 2017 19:12:09 +0000 (12:12 -0700)]
Fix #62545908 : 'metered' network jobs run without network

Test: JobSchedulerTestApp

Change-Id: I9c15022f5542163a27c6aaa4c3ee6b677cffd699

7 years agoMerge "Binder: Add more logging on Error" into oc-dev
TreeHugger Robot [Tue, 13 Jun 2017 21:03:38 +0000 (21:03 +0000)]
Merge "Binder: Add more logging on Error" into oc-dev

7 years agoMerge "Merge "remove the lock-use for prunePrintService in case blocking main thread...
Android Build Merger (Role) [Tue, 13 Jun 2017 20:59:52 +0000 (20:59 +0000)]
Merge "Merge "remove the lock-use for prunePrintService in case blocking main thread" am: b124bea782 am: 60246acdbf am: a76f1cbd1d" into oc-dr1-dev-plus-aosp

7 years agoMerge "remove the lock-use for prunePrintService in case blocking main thread" am...
yangbingqian [Tue, 13 Jun 2017 20:59:12 +0000 (20:59 +0000)]
Merge "remove the lock-use for prunePrintService in case blocking main thread" am: b124bea782 am: 60246acdbf
am: a76f1cbd1d

Change-Id: I952759d6fcf072f36b7cf0a896eeb03702b6014d

7 years agoMerge "Add updateMethod callback" am: a0974dbc0f
Robert Greenwalt [Tue, 13 Jun 2017 20:59:09 +0000 (20:59 +0000)]
Merge "Add updateMethod callback" am: a0974dbc0f
am: 7791ac2e28

Change-Id: I3402217fddc77d03b191ac7af0d938c6fa931486

7 years agoMerge "Add EXTRA_HANDOVER_FROM_PHONE_ACCOUNT." into oc-dr1-dev
Tyler Gunn [Tue, 13 Jun 2017 20:55:58 +0000 (20:55 +0000)]
Merge "Add EXTRA_HANDOVER_FROM_PHONE_ACCOUNT." into oc-dr1-dev
am: 48962fcc3b

Change-Id: I6734494a42629f67829cb93e6d11d1b11277d3fb

7 years agoMerge "Add updateMethod callback"
Robert Greenwalt [Tue, 13 Jun 2017 20:51:39 +0000 (20:51 +0000)]
Merge "Add updateMethod callback"
am: a0974dbc0f

Change-Id: I9dc2564d0856db617c0deb6bff35ca3cf6b6010c

7 years agoMerge "Radio Interface changes to pass the encryption object, including the key,to...
Pankaj Kanwar [Tue, 13 Jun 2017 20:50:15 +0000 (20:50 +0000)]
Merge "Radio Interface changes to pass the encryption object, including the key,to the modem." am: aadb414f02 am: 717b5bf3e0
am: 8532bc3b59

Change-Id: Idd49ae115d660cb21ed7baf4e66f5ec0f89e3e53

7 years agoMerge "Add EXTRA_HANDOVER_FROM_PHONE_ACCOUNT." into oc-dr1-dev
Tyler Gunn [Tue, 13 Jun 2017 20:48:12 +0000 (20:48 +0000)]
Merge "Add EXTRA_HANDOVER_FROM_PHONE_ACCOUNT." into oc-dr1-dev

7 years agoMerge "remove the lock-use for prunePrintService in case blocking main thread" am...
yangbingqian [Tue, 13 Jun 2017 20:48:10 +0000 (20:48 +0000)]
Merge "remove the lock-use for prunePrintService in case blocking main thread" am: b124bea782
am: 60246acdbf

Change-Id: If773ac8166bee1e92168f4df7a9de2dd7cea190f

7 years agoMerge "remove the lock-use for prunePrintService in case blocking main thread"
yangbingqian [Tue, 13 Jun 2017 20:41:03 +0000 (20:41 +0000)]
Merge "remove the lock-use for prunePrintService in case blocking main thread"
am: b124bea782

Change-Id: Ie93b79dfff5787cb9835c4ba86e3aa586e0d2ad8

7 years agoMerge "Add updateMethod callback"
Robert Greenwalt [Tue, 13 Jun 2017 20:38:49 +0000 (20:38 +0000)]
Merge "Add updateMethod callback"

7 years agoMerge "Radio Interface changes to pass the encryption object, including the key,to...
Pankaj Kanwar [Tue, 13 Jun 2017 20:38:46 +0000 (20:38 +0000)]
Merge "Radio Interface changes to pass the encryption object, including the key,to the modem." am: aadb414f02
am: 717b5bf3e0

Change-Id: I8133ca2e269f74dd2c7b8a17f81de24567fcdc2e

7 years agoMerge "remove the lock-use for prunePrintService in case blocking main thread"
Treehugger Robot [Tue, 13 Jun 2017 20:30:37 +0000 (20:30 +0000)]
Merge "remove the lock-use for prunePrintService in case blocking main thread"

7 years agoMerge "Radio Interface changes to pass the encryption object, including the key,to...
Pankaj Kanwar [Tue, 13 Jun 2017 20:30:36 +0000 (20:30 +0000)]
Merge "Radio Interface changes to pass the encryption object, including the key,to the modem."
am: aadb414f02

Change-Id: I2f2189aa6483dfe17fe6ed7f42e8b23166c67444

7 years agoMerge "Radio Interface changes to pass the encryption object, including the key,to...
Pankaj Kanwar [Tue, 13 Jun 2017 20:22:22 +0000 (20:22 +0000)]
Merge "Radio Interface changes to pass the encryption object, including the key,to the modem."

7 years agoDo not CloseGuard KernelID or FieldID
Yang Ni [Fri, 28 Apr 2017 15:45:40 +0000 (08:45 -0700)]
Do not CloseGuard KernelID or FieldID

Bug: 28053584

Stop CloseGuarding for two reasons:

1) KernelID and FieldID objects are constructed in auto-generated
(RenderScript reflected) Java code. It would be impossible for a user to
explicitly call destroy() on them. Guarding them would leave a lot of
noisy warnings in logcat.

2) These KernelID and FieldID objects are not big compared to other
RenderScript objects, e.g. Allocations. They occupy almost no native
resources except for a native pointer. Leaving their destruction to Java
GC would be completely acceptable, since any delay in reclaiming them is
unlikely to cause memory pressure.

Test: CTS on x86_64 emulator
Change-Id: I587b5561a0b2bdbf0b2e95bf2995c20d5f5faf9d

7 years agoSend ACTION_SHUTDOWN broadcast to manifest receivers
Christopher Tate [Tue, 13 Jun 2017 19:11:09 +0000 (12:11 -0700)]
Send ACTION_SHUTDOWN broadcast to manifest receivers

Fix #36767224
Test: manual

Change-Id: If8f1fa986b9b8f3c426e4c0623bbca6f96b7199c

7 years agoMerge "AOD: Use double tap coordinates to trigger Ambient Indication" into oc-dr1-dev
Adrian Roos [Tue, 13 Jun 2017 19:25:52 +0000 (19:25 +0000)]
Merge "AOD: Use double tap coordinates to trigger Ambient Indication" into oc-dr1-dev
am: 2402522553

Change-Id: I22486ede65b6a07683cea4b8f5c48de94ae7a148

7 years agoMerge "AOD: Use double tap coordinates to trigger Ambient Indication" into oc-dr1-dev
TreeHugger Robot [Tue, 13 Jun 2017 19:17:37 +0000 (19:17 +0000)]
Merge "AOD: Use double tap coordinates to trigger Ambient Indication" into oc-dr1-dev

7 years agoMerge "Merge "Binder: Add more logging on Error" am: d9f3a3cf37 am: e3bda6170d am...
Android Build Merger (Role) [Tue, 13 Jun 2017 19:09:50 +0000 (19:09 +0000)]
Merge "Merge "Binder: Add more logging on Error" am: d9f3a3cf37 am: e3bda6170d am: 6d908413bd" into oc-dr1-dev-plus-aosp

7 years agoChange SlashDrawable semantics to fix QS crash
Evan Laird [Tue, 13 Jun 2017 19:09:21 +0000 (15:09 -0400)]
Change SlashDrawable semantics to fix QS crash

SlashDrawable wraps a reference to Drawable in order to store the
intended Drawable and optionally draw a slash over it. As such, it
should probably have similar semantics to Drawable, in that it either
exists or doesn't; if you set SlashImageView's drawable to `null`, you'd
expect that the drawable goes away, not that the SlashDrawable's
contained Drawable goes away but the slash stays.

Test: runtest systemui
Change-Id: I34b92716cc60ba5043ab68ae09954f5a5e97e562
Fixes: 62525439

7 years agoMerge "Binder: Add more logging on Error" am: d9f3a3cf37 am: e3bda6170d
Andreas Gampe [Tue, 13 Jun 2017 19:08:54 +0000 (19:08 +0000)]
Merge "Binder: Add more logging on Error" am: d9f3a3cf37 am: e3bda6170d
am: 6d908413bd

Change-Id: I828b2dca2109334d27f43f9bc04c00214d14ba1e

7 years agoMerge "Merge "Address issues surrounding freezing by display." into oc-dev am: 8ab4d1...
Android Build Merger (Role) [Tue, 13 Jun 2017 19:08:22 +0000 (19:08 +0000)]
Merge "Merge "Address issues surrounding freezing by display." into oc-dev am: 8ab4d11145 am: c717e603b1" into oc-dr1-dev-plus-aosp

7 years agoMerge "Address issues surrounding freezing by display." into oc-dev am: 8ab4d11145
Bryce Lee [Tue, 13 Jun 2017 19:07:25 +0000 (19:07 +0000)]
Merge "Address issues surrounding freezing by display." into oc-dev am: 8ab4d11145
am: c717e603b1

Change-Id: I584661bb20175ef11e761ce87c629de9f7b29dc6

7 years agoSave overlay paths as user state
Todd Kennedy [Tue, 13 Jun 2017 15:24:32 +0000 (08:24 -0700)]
Save overlay paths as user state

Instead of maintaining a separate structure just for overlay
paths, store them as user state in the package setting. Also
centralize updating the overlay paths to avoid issues with
inconsistent updates.

Fixes: 36561125
Test: Manual
Change-Id: Iac1c987e8650074dbc564e332d5da1950fad6ac5

7 years agoMerge "Address issues surrounding freezing by display." into oc-dev am: 8ab4d11145
Bryce Lee [Tue, 13 Jun 2017 19:03:56 +0000 (19:03 +0000)]
Merge "Address issues surrounding freezing by display." into oc-dev am: 8ab4d11145
am: fb385a6c15

Change-Id: I384de2479a69df5a6463586d87eb3cd5b2eebcbe

7 years agoMerge "Binder: Add more logging on Error" am: d9f3a3cf37
Andreas Gampe [Tue, 13 Jun 2017 19:02:21 +0000 (19:02 +0000)]
Merge "Binder: Add more logging on Error" am: d9f3a3cf37
am: e3bda6170d

Change-Id: Iec158813e6892fba5449219e32a7201fae142037

7 years agoMerge "Address issues surrounding freezing by display." into oc-dev
Bryce Lee [Tue, 13 Jun 2017 18:56:53 +0000 (18:56 +0000)]
Merge "Address issues surrounding freezing by display." into oc-dev
am: 8ab4d11145

Change-Id: If9ec8e8492ed8249cc99dfe05e97a0cf62ff8dd8

7 years agoMerge "Address issues surrounding freezing by display." into oc-dev
Bryce Lee [Tue, 13 Jun 2017 18:56:52 +0000 (18:56 +0000)]
Merge "Address issues surrounding freezing by display." into oc-dev
am: 8ab4d11145

Change-Id: I5eec6ff604056b7095ac07afd9721a5223a584d8

7 years agoMerge "Address issues surrounding freezing by display." into oc-dev
Bryce Lee [Tue, 13 Jun 2017 18:50:57 +0000 (18:50 +0000)]
Merge "Address issues surrounding freezing by display." into oc-dev

7 years agoMerge "Binder: Add more logging on Error"
Andreas Gampe [Tue, 13 Jun 2017 18:45:27 +0000 (18:45 +0000)]
Merge "Binder: Add more logging on Error"
am: d9f3a3cf37

Change-Id: I58eb483fff9fa9c4f2519fbd842172f48f1052e9

7 years agoMerge "Binder: Add more logging on Error"
Andreas Gampe [Tue, 13 Jun 2017 18:34:45 +0000 (18:34 +0000)]
Merge "Binder: Add more logging on Error"

7 years agoFix issue #62390590: SecurityException in JobIntentService$...
Dianne Hackborn [Tue, 13 Jun 2017 17:33:19 +0000 (10:33 -0700)]
Fix issue #62390590:  SecurityException in JobIntentService$...

...JobServiceEngineImpl$WrapperWorkItem.complete

When a job is in the process of stopping a job, we should no
longer allow new work to be dispatched for it.

Also there was an issue with how we determine wether a caller
is valid for the current job -- this was only based on the uid
of the currently running job, but of course that context could
be re-used for a new job of the same uid.  Instead, we now create
a different callback binder for each client, so we can identify
the exact client each time it calls back.  (This also allows us
to hang information about why the job last stopped on that
client state, so we can always report it.)

Finally make a bunch of classes final that should have been.

Test: bit CtsJobSchedulerTestCases:*

Change-Id: I1b00dd2da710414dd2898c4d39a5c528d54b95ea

7 years agoAdd EXTRA_HANDOVER_FROM_PHONE_ACCOUNT.
Tyler Gunn [Fri, 26 May 2017 20:30:09 +0000 (13:30 -0700)]
Add EXTRA_HANDOVER_FROM_PHONE_ACCOUNT.

Used in handovers to tell the account we're handing over to which account
the call is from.

Test: Manual
Bug: 38027075
Change-Id: I9b61a5fce3e4f7344174a1b81f4964ca02b71ccd

7 years agoAOD: Use double tap coordinates to trigger Ambient Indication
Adrian Roos [Fri, 2 Jun 2017 19:50:38 +0000 (12:50 -0700)]
AOD: Use double tap coordinates to trigger Ambient Indication

Bug: 38386446
Test: Double tap on AOD, verify that it still works. On device that supports double tap coordinates, verify that double tapping on ambient music opens ambient music.
Change-Id: Ic75ba731a980c9598c85927e83d2032f01da4822
(cherry picked from commit 44198f5124743f0d603eb4efa3b436bd96f32144)

7 years agoFix sysui depending on slow bt calls
Jason Monk [Tue, 13 Jun 2017 16:49:55 +0000 (12:49 -0400)]
Fix sysui depending on slow bt calls

Move calls to a background thread and cache the results to avoid
slowing down sysui when there are too many bluetooth devices.

Test: runtest systemui
Change-Id: Ica10e86ca6b2783c30ed9de68f1a91dc5cfdf068
Fixes: 38118549

7 years agoBinder: Add more logging on Error
Andreas Gampe [Mon, 12 Jun 2017 17:43:05 +0000 (10:43 -0700)]
Binder: Add more logging on Error

Try to add the Error's message to the abort, so that it shows up
when the logcat is missing.

Sample message:

'jni_internal.cc:508] JNI FatalError called: java.lang.Error thrown during binder transaction: java.lang.LinkageError: This is a test.'

(cherry picked from commit 58383ba095f552a58ed416736fe049126c647ffd)

Bug: 62514767
Test: m
Change-Id: I12026bb7a8ec9438db493f135ed5d0177187f702

7 years agoMerge changes I73ae8de1,I58260902 am: 6f11744adc am: a506180804
Narayan Kamath [Tue, 13 Jun 2017 15:53:15 +0000 (15:53 +0000)]
Merge changes I73ae8de1,I58260902 am: 6f11744adc am: a506180804
am: d1941e51a6

Change-Id: I0b5e2850cd3710638660d0c58ed7c9cde869726f

7 years agoMerge changes I73ae8de1,I58260902 am: 6f11744adc
Narayan Kamath [Tue, 13 Jun 2017 15:45:48 +0000 (15:45 +0000)]
Merge changes I73ae8de1,I58260902 am: 6f11744adc
am: a506180804

Change-Id: I572de6f022670cd14223ada2f5fe6cf6f7a87a98

7 years agoMerge changes I73ae8de1,I58260902
Narayan Kamath [Tue, 13 Jun 2017 15:38:42 +0000 (15:38 +0000)]
Merge changes I73ae8de1,I58260902
am: 6f11744adc

Change-Id: I9b47ae1d3953280a627584902b3bc099e1f907c8