OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Fixed autofill dumpsys and improved logging." into oc-dev
Felipe Leme [Thu, 11 May 2017 00:41:10 +0000 (00:41 +0000)]
Merge "Fixed autofill dumpsys and improved logging." into oc-dev
am: 08d8e034f4

Change-Id: I303ec6c9d1bef5d88b33c35e62c598ad6082c6ad

7 years agoMerge "AOD: Anchor clock at a third of the height" into oc-dev
Adrian Roos [Thu, 11 May 2017 00:30:58 +0000 (00:30 +0000)]
Merge "AOD: Anchor clock at a third of the height" into oc-dev
am: 2af0676b2d

Change-Id: I4eefd2a95a82c573f54fe3e71919e8553c42d206

7 years agoMerge "Merge "Fixed a concurrent modification crash" into oc-dev am: 33bd2c6333"...
Android Build Merger (Role) [Thu, 11 May 2017 00:26:50 +0000 (00:26 +0000)]
Merge "Merge "Fixed a concurrent modification crash" into oc-dev am: 33bd2c6333" into oc-dev-plus-aosp

7 years agoMerge "Fixed a concurrent modification crash" into oc-dev
Selim Cinek [Thu, 11 May 2017 00:25:15 +0000 (00:25 +0000)]
Merge "Fixed a concurrent modification crash" into oc-dev
am: 33bd2c6333

Change-Id: Ic707ae6d212bc0d686c778f53d7decb5a84f0b00

7 years agoMerge "Merge "Adding a new config and Setting for WiFi Wakeup." into oc-dev am: b569e...
Android Build Merger (Role) [Thu, 11 May 2017 00:24:47 +0000 (00:24 +0000)]
Merge "Merge "Adding a new config and Setting for WiFi Wakeup." into oc-dev am: b569eedf37" into oc-dev-plus-aosp

7 years agoMerge "Merge "Merge "Notify ImsService Status Correctly" am: 1bb9181380 am: 6d249dc08...
Android Build Merger (Role) [Thu, 11 May 2017 00:20:19 +0000 (00:20 +0000)]
Merge "Merge "Merge "Notify ImsService Status Correctly" am: 1bb9181380 am: 6d249dc08c" into nyc-mr2-dev-plus-aosp am: a27aba8c4a  -s ours" into oc-dev-plus-aosp

7 years agoMerge "Adding a new config and Setting for WiFi Wakeup." into oc-dev
Jeremy Joslin [Thu, 11 May 2017 00:18:48 +0000 (00:18 +0000)]
Merge "Adding a new config and Setting for WiFi Wakeup." into oc-dev
am: b569eedf37

Change-Id: Id4e9f4644bc470d1a3b8813502eb3e1e2ca45f05

7 years agoMerge "Fixed autofill dumpsys and improved logging." into oc-dev
TreeHugger Robot [Thu, 11 May 2017 00:18:32 +0000 (00:18 +0000)]
Merge "Fixed autofill dumpsys and improved logging." into oc-dev

7 years agoMerge "Merge "Notify ImsService Status Correctly" am: 1bb9181380 am: 6d249dc08c"...
Brad Ebinger [Thu, 11 May 2017 00:18:29 +0000 (00:18 +0000)]
Merge "Merge "Notify ImsService Status Correctly" am: 1bb9181380 am: 6d249dc08c" into nyc-mr2-dev-plus-aosp
am: a27aba8c4a  -s ours

Change-Id: Icf812ff6e9269942cf1ce5318356907a57cc2b80

7 years agoMerge "Reconnect to DAService after binding is dead" into oc-dev
Makoto Onuki [Thu, 11 May 2017 00:15:47 +0000 (00:15 +0000)]
Merge "Reconnect to DAService after binding is dead" into oc-dev
am: ef5700667f

Change-Id: I03049914406ed38f92c3a6a43a82f55504c6e518

7 years agoMerge "Merge "Notify ImsService Status Correctly" am: 1bb9181380 am: 6d249dc08c am...
Android Build Merger (Role) [Thu, 11 May 2017 00:12:48 +0000 (00:12 +0000)]
Merge "Merge "Notify ImsService Status Correctly" am: 1bb9181380 am: 6d249dc08c am: 96e8803185  -s ours" into oc-dev-plus-aosp

7 years agoMerge "Notify ImsService Status Correctly" am: 1bb9181380 am: 6d249dc08c
Brad Ebinger [Thu, 11 May 2017 00:10:51 +0000 (00:10 +0000)]
Merge "Notify ImsService Status Correctly" am: 1bb9181380 am: 6d249dc08c
am: 96e8803185  -s ours

Change-Id: I4375c629e5b04de5fb531c0cc2df969ff0ea1b54

7 years agoMerge "AOD: Anchor clock at a third of the height" into oc-dev
Adrian Roos [Thu, 11 May 2017 00:08:33 +0000 (00:08 +0000)]
Merge "AOD: Anchor clock at a third of the height" into oc-dev

7 years agoMerge "Fixed a concurrent modification crash" into oc-dev
TreeHugger Robot [Thu, 11 May 2017 00:08:10 +0000 (00:08 +0000)]
Merge "Fixed a concurrent modification crash" into oc-dev

7 years agoMerge "Offload saving bitmaps from binder threads" into oc-dev
Makoto Onuki [Thu, 11 May 2017 00:06:56 +0000 (00:06 +0000)]
Merge "Offload saving bitmaps from binder threads" into oc-dev
am: 31ef139466

Change-Id: I2980b05a8a997e003792fe995973b54eaf29d5e1

7 years agoMerge "Adding a new config and Setting for WiFi Wakeup." into oc-dev
TreeHugger Robot [Thu, 11 May 2017 00:05:48 +0000 (00:05 +0000)]
Merge "Adding a new config and Setting for WiFi Wakeup." into oc-dev

7 years agoMerge "Tweak for b/37809561." into oc-dev
Makoto Onuki [Thu, 11 May 2017 00:04:14 +0000 (00:04 +0000)]
Merge "Tweak for b/37809561." into oc-dev
am: ca50e88b6b

Change-Id: I7ecbf3e077cdd9b06e9c1a13455c572c6f21c00e

7 years agoMerge "Merge "Notify ImsService Status Correctly" am: 1bb9181380 am: 6d249dc08c"...
Android Build Merger (Role) [Thu, 11 May 2017 00:03:20 +0000 (00:03 +0000)]
Merge "Merge "Notify ImsService Status Correctly" am: 1bb9181380 am: 6d249dc08c" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Notify ImsService Status Correctly" am: 1bb9181380
Brad Ebinger [Thu, 11 May 2017 00:01:43 +0000 (00:01 +0000)]
Merge "Notify ImsService Status Correctly" am: 1bb9181380
am: 6d249dc08c

Change-Id: I1ad0e6187f2b3de1f32b0391ce97447a831874b3

7 years agoMerge "Notify ImsService Status Correctly" am: 1bb9181380
Brad Ebinger [Wed, 10 May 2017 23:55:18 +0000 (23:55 +0000)]
Merge "Notify ImsService Status Correctly" am: 1bb9181380
am: 6d249dc08c

Change-Id: I5cd0317376fcf915c777ed56da9e856d72272b41

7 years agoMerge "Notify ImsService Status Correctly" into oc-dev
Brad Ebinger [Wed, 10 May 2017 23:54:32 +0000 (23:54 +0000)]
Merge "Notify ImsService Status Correctly" into oc-dev
am: 9684d718fa

Change-Id: Ia056fd9cc30e673056e7e9b5140c498bb6abce1b

7 years agoMerge "support horizontal scroll and zoon for webview" into oc-dev
Chen Xu [Wed, 10 May 2017 23:50:17 +0000 (23:50 +0000)]
Merge "support horizontal scroll and zoon for webview" into oc-dev
am: be0078f018

Change-Id: I9f253695288ffdc4b134e47ae0fd2cd8ed0296be

7 years agoMerge "Notify ImsService Status Correctly"
Brad Ebinger [Wed, 10 May 2017 23:48:12 +0000 (23:48 +0000)]
Merge "Notify ImsService Status Correctly"
am: 1bb9181380

Change-Id: I694072b5125151cd1db6b88774c09126199e7cc0

7 years agoMerge "Fix npe due to strict mode in Bitmap.sameAs" into oc-dev
Sergey Vasilinets [Wed, 10 May 2017 23:46:50 +0000 (23:46 +0000)]
Merge "Fix npe due to strict mode in Bitmap.sameAs" into oc-dev
am: 8d2b02bf08

Change-Id: I88c7ffb54b3dfc12a24594c20a7b3787f81dc028

7 years agoMerge "Fix QS footer on small screens" into oc-dev
Jason Monk [Wed, 10 May 2017 23:43:30 +0000 (23:43 +0000)]
Merge "Fix QS footer on small screens" into oc-dev
am: 9bda9ead49

Change-Id: I6e425ae473e5025ae52f39b11f004ce71ae0fa7f

7 years agoMerge "Reconnect to DAService after binding is dead" into oc-dev
Makoto Onuki [Wed, 10 May 2017 23:20:35 +0000 (23:20 +0000)]
Merge "Reconnect to DAService after binding is dead" into oc-dev

7 years agoMerge "Fix VR component enforcement for "2D in 3D" apps." into oc-dev
Ruben Brunk [Wed, 10 May 2017 23:04:07 +0000 (23:04 +0000)]
Merge "Fix VR component enforcement for "2D in 3D" apps." into oc-dev
am: 4d73fd5765

Change-Id: I7031eb3ac81aa95df7a729ad358f5288b1cabc4e

7 years agoMerge "Notify ImsService Status Correctly"
Brad Ebinger [Wed, 10 May 2017 23:00:52 +0000 (23:00 +0000)]
Merge "Notify ImsService Status Correctly"

7 years agoMerge "AOD: Notification groups on Ambient Display" into oc-dev
Adrian Roos [Wed, 10 May 2017 22:55:58 +0000 (22:55 +0000)]
Merge "AOD: Notification groups on Ambient Display" into oc-dev
am: bafe438d71

Change-Id: I159e4543f15c5d2f89bbfee10f77ed33aaaad7a7

7 years agoMerge "Fix battery icon tint in QS during battery saver" into oc-dev
Jason Monk [Wed, 10 May 2017 22:39:15 +0000 (22:39 +0000)]
Merge "Fix battery icon tint in QS during battery saver" into oc-dev
am: 0b9e1e7f22

Change-Id: Ib5608f431e8586eb3c79151bade78c9f3656ad51

7 years agoMerge "Merge "Add Save and Restore of BluetoothOn setting" am: bbcc641317 am: 1755a4a...
Android Build Merger (Role) [Wed, 10 May 2017 22:34:47 +0000 (22:34 +0000)]
Merge "Merge "Add Save and Restore of BluetoothOn setting" am: bbcc641317 am: 1755a4af45 am: 6682651b2b" into oc-dev-plus-aosp

7 years agoMerge "Add Save and Restore of BluetoothOn setting" am: bbcc641317 am: 1755a4af45
Stanley Tng [Wed, 10 May 2017 22:32:32 +0000 (22:32 +0000)]
Merge "Add Save and Restore of BluetoothOn setting" am: bbcc641317 am: 1755a4af45
am: 6682651b2b

Change-Id: I6dd36520e8a0cf09c75788eda2e03b4309acea9e

7 years agoMerge "Fix Toast exception in NotificationManagerService" into oc-dev
Geoffrey Pitsch [Wed, 10 May 2017 22:31:09 +0000 (22:31 +0000)]
Merge "Fix Toast exception in NotificationManagerService" into oc-dev
am: 3ee2bfd8f5

Change-Id: I10a6e8958b66463762188a82ed05ca24ff538805

7 years agoMerge "Offload saving bitmaps from binder threads" into oc-dev
TreeHugger Robot [Wed, 10 May 2017 22:24:09 +0000 (22:24 +0000)]
Merge "Offload saving bitmaps from binder threads" into oc-dev

7 years agoMerge "Tweak for b/37809561." into oc-dev
Makoto Onuki [Wed, 10 May 2017 22:20:29 +0000 (22:20 +0000)]
Merge "Tweak for b/37809561." into oc-dev

7 years agoMerge "Update input method menu to use proper context." into oc-dev
Andrew Sapperstein [Wed, 10 May 2017 22:13:02 +0000 (22:13 +0000)]
Merge "Update input method menu to use proper context." into oc-dev
am: 2ead893b18

Change-Id: I1de100ecc38e0fc72506b6ecd123ea2cfb86416b

7 years agoMerge "Revert "Fixed placemente of Autofill UI for virtual views."" into oc-dev
Svet Ganov [Wed, 10 May 2017 22:09:50 +0000 (22:09 +0000)]
Merge "Revert "Fixed placemente of Autofill UI for virtual views."" into oc-dev
am: e59c6ef346

Change-Id: I3c615043966131d206967bbb7d230af9b6652f47

7 years agoMerge "Label the close image button" into oc-dev
Svet Ganov [Wed, 10 May 2017 22:05:55 +0000 (22:05 +0000)]
Merge "Label the close image button" into oc-dev
am: c453901d13

Change-Id: Ic7dcf152a9759865619129fb1f3d06dbb75e2921

7 years agoMerge "Add Save and Restore of BluetoothOn setting" am: bbcc641317
Stanley Tng [Wed, 10 May 2017 22:04:24 +0000 (22:04 +0000)]
Merge "Add Save and Restore of BluetoothOn setting" am: bbcc641317
am: 1755a4af45

Change-Id: I6a143760d9acef0fb5f28680ca1538e346ebd81f

7 years agoMerge "If ENSURE_VERIFY_APPS is enforced, reject installation by default." into oc-dev
Pavel Grafov [Wed, 10 May 2017 21:34:27 +0000 (21:34 +0000)]
Merge "If ENSURE_VERIFY_APPS is enforced, reject installation by default." into oc-dev
am: 79cc05a6c1

Change-Id: Iaf27be8afb90c8364fa365d6d21bef61e8b7470b

7 years agoMerge "Add uniqueId to Virtual Display and pass through to inputflinger (1/2)" into...
TreeHugger Robot [Wed, 10 May 2017 21:18:46 +0000 (21:18 +0000)]
Merge "Add uniqueId to Virtual Display and pass through to inputflinger (1/2)" into oc-dev-plus-aosp

7 years agoMerge "Add Save and Restore of BluetoothOn setting"
Stanley Tng [Wed, 10 May 2017 21:17:44 +0000 (21:17 +0000)]
Merge "Add Save and Restore of BluetoothOn setting"
am: bbcc641317

Change-Id: Ie967141aa0d8f43750f84fdd6071c26e0a26958a

7 years agoFixed a concurrent modification crash
Selim Cinek [Fri, 5 May 2017 21:45:11 +0000 (14:45 -0700)]
Fixed a concurrent modification crash

Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/settings/CurrentUserTrackerTest.java
Change-Id: I23261843b7366d3a66a795a41c61b7661f7ca3a6
Fixes: 38006784

7 years agoMerge "Add Save and Restore of BluetoothOn setting"
Treehugger Robot [Wed, 10 May 2017 20:44:33 +0000 (20:44 +0000)]
Merge "Add Save and Restore of BluetoothOn setting"

7 years agoMerge "Notify ImsService Status Correctly" into oc-dev
Brad Ebinger [Wed, 10 May 2017 20:42:34 +0000 (20:42 +0000)]
Merge "Notify ImsService Status Correctly" into oc-dev

7 years agoMerge "support horizontal scroll and zoon for webview" into oc-dev
Chen Xu [Wed, 10 May 2017 20:31:50 +0000 (20:31 +0000)]
Merge "support horizontal scroll and zoon for webview" into oc-dev

7 years agoMerge "Fix npe due to strict mode in Bitmap.sameAs" into oc-dev
Sergey Vasilinets [Wed, 10 May 2017 20:28:21 +0000 (20:28 +0000)]
Merge "Fix npe due to strict mode in Bitmap.sameAs" into oc-dev

7 years agoAdd uniqueId to Virtual Display and pass through to inputflinger (1/2)
Santos Cordon [Wed, 5 Apr 2017 17:31:15 +0000 (10:31 -0700)]
Add uniqueId to Virtual Display and pass through to inputflinger (1/2)

This CL adds :
1) Adds uniqueId (protected via system/sig permission) to virtual
displays.
2) Add support for N virtual display viewports into inputflinger.
3) Set the virtual display's viewports in inputflinger if it has the
uniqueId value set to non-null. (a) Moving the new viewport from java to
native inputflinger and (b) adding "uniqueId" value to viewports makes
up the great majority of this change.
4) From the inputflinger side, we also read in a new value from the
input device configuration files called 'touch.displayId'.
5) When touch.displayId and the virtual display's uniqueId match,
inputflinger links the two.

Test: Start VR and ensure that the virtual viewport shows up when running
'adb shell dump input".  Run a VR app, and ensure that the virtual input
device is associated with the new virtual viewport.
Test: com.android.server.display.DisplayManagerServiceTest

Bug: 36051620
Change-Id: Id728d6e7292feaa1d8de7660bc6a2ec90fa1ff3c

7 years agoFixed autofill dumpsys and improved logging.
Felipe Leme [Tue, 9 May 2017 00:23:52 +0000 (17:23 -0700)]
Fixed autofill dumpsys and improved logging.

Fixes: 38196286
Bug: 37997043

Test: adb shell dumpsys autofill -a
Test: CtsAutoFillServiceTestCases pass

Change-Id: Ifaae7b5c0894ecf0d16fff8a3c96e4746fe2361b

7 years agoMerge "Use application context getting secondary displays." into oc-dev
Bryce Lee [Wed, 10 May 2017 19:22:15 +0000 (19:22 +0000)]
Merge "Use application context getting secondary displays." into oc-dev
am: 456882b5ae

Change-Id: Ib45a340b34f11f0112c91893893f32e0a849cf93

7 years agoMerge "Merge "Increase limit of locale pairs" am: aa9a59ab32 am: 22ff1759d2 am: dba95...
Android Build Merger (Role) [Wed, 10 May 2017 19:00:42 +0000 (19:00 +0000)]
Merge "Merge "Increase limit of locale pairs" am: aa9a59ab32 am: 22ff1759d2 am: dba95b0c94" into oc-dev-plus-aosp

7 years agoMerge "Increase limit of locale pairs" am: aa9a59ab32 am: 22ff1759d2
Hall Liu [Wed, 10 May 2017 18:58:23 +0000 (18:58 +0000)]
Merge "Increase limit of locale pairs" am: aa9a59ab32 am: 22ff1759d2
am: dba95b0c94

Change-Id: I7135571a65625f3aa3ada7a0c1b00f08c565fce9

7 years agoReconnect to DAService after binding is dead
Makoto Onuki [Mon, 1 May 2017 17:05:28 +0000 (10:05 -0700)]
Reconnect to DAService after binding is dead

- When the DO/PO process crashes twice with a short interval, AM gives up
and the binding will be "died".  Once binding is in this state it'll never
be re-connected.

(Still, DO/PO can disable and re-enable their DAS to force DPMS to bind again
though.)

- Detect this and re-connect after one hour.

- Back-off time will be exponentially increased and never reset until DPMS
explicitly re-connects, which happens when:
-- the device rebooted,
-- the user stopped and re-started, or
-- the DAS is disabled and re-enabled.

Test: adb shell am instrument -e class com.android.server.am.PersistentConnectionTest -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.devicepolicy.DevicePolicyConstantsTest -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.devicepolicy.DevicePolicyManagerTest -w com.android.frameworks.servicestests
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l VERBOSE -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceAdminServiceDeviceOwnerTest
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l VERBOSE -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceAdminServiceProfileOwnerTest

Bug 37711907

Change-Id: Ie0b227a94e6ce85d72a969a4dea1020baf734e2f

7 years agoMerge "Disable parts of tuner from user builds" into oc-dev
Jason Monk [Wed, 10 May 2017 18:54:34 +0000 (18:54 +0000)]
Merge "Disable parts of tuner from user builds" into oc-dev
am: 53ae4dbf8c

Change-Id: I7409558792e77fa16f0e4b95fdf7ae40e59ed1ed

7 years agoAOD: Anchor clock at a third of the height
Adrian Roos [Fri, 28 Apr 2017 16:23:19 +0000 (09:23 -0700)]
AOD: Anchor clock at a third of the height

Change-Id: Ie9074be76f23f9c353e38b515fd5a3cd9702696d
Fixes: 37646086
Test: Trigger AOD, observe that clock does not shift in response to notifications.

7 years agoMerge "Fix QS footer on small screens" into oc-dev
TreeHugger Robot [Wed, 10 May 2017 18:39:10 +0000 (18:39 +0000)]
Merge "Fix QS footer on small screens" into oc-dev

7 years agoMerge "Increase limit of locale pairs" am: aa9a59ab32
Hall Liu [Wed, 10 May 2017 18:31:12 +0000 (18:31 +0000)]
Merge "Increase limit of locale pairs" am: aa9a59ab32
am: 22ff1759d2

Change-Id: Ib993597558b13e9879dc56014af8529aa84c4480

7 years agoMerge "Update QS mobile data unavailable asset" into oc-dev
Jason Monk [Wed, 10 May 2017 18:26:53 +0000 (18:26 +0000)]
Merge "Update QS mobile data unavailable asset" into oc-dev
am: 66c81e379e

Change-Id: I8feecad17a1613bd6774a6a557f8986b300c38b0

7 years agoMerge "Fix VR component enforcement for "2D in 3D" apps." into oc-dev
Ruben Brunk [Wed, 10 May 2017 18:19:00 +0000 (18:19 +0000)]
Merge "Fix VR component enforcement for "2D in 3D" apps." into oc-dev

7 years agoMerge "AOD: Notification groups on Ambient Display" into oc-dev
Adrian Roos [Wed, 10 May 2017 18:17:36 +0000 (18:17 +0000)]
Merge "AOD: Notification groups on Ambient Display" into oc-dev

7 years agoMerge "Fix battery icon tint in QS during battery saver" into oc-dev
Jason Monk [Wed, 10 May 2017 18:03:13 +0000 (18:03 +0000)]
Merge "Fix battery icon tint in QS during battery saver" into oc-dev

7 years agoMerge "Merge "Update startStreaming to return status code" am: 6476ceeaee am: a89cace...
Android Build Merger (Role) [Wed, 10 May 2017 18:00:10 +0000 (18:00 +0000)]
Merge "Merge "Update startStreaming to return status code" am: 6476ceeaee am: a89cacebfb am: 331058a871" into oc-dev-plus-aosp

7 years agoMerge "Fix brightness dialog background to be light" into oc-dev
Jason Monk [Wed, 10 May 2017 17:51:02 +0000 (17:51 +0000)]
Merge "Fix brightness dialog background to be light" into oc-dev
am: 175f53b2d6

Change-Id: Ic062c499bbb5a5aade5da15a6a038324e47a866e

7 years agoMerge "Update startStreaming to return status code" am: 6476ceeaee am: a89cacebfb
Robert Greenwalt [Wed, 10 May 2017 17:50:17 +0000 (17:50 +0000)]
Merge "Update startStreaming to return status code" am: 6476ceeaee am: a89cacebfb
am: 331058a871

Change-Id: Ie2bc9f47e7774a838829720379fc5865e71d2f0f

7 years agoMerge "Fix Toast exception in NotificationManagerService" into oc-dev
TreeHugger Robot [Wed, 10 May 2017 17:41:12 +0000 (17:41 +0000)]
Merge "Fix Toast exception in NotificationManagerService" into oc-dev

7 years agoMerge "Update input method menu to use proper context." into oc-dev
Andrew Sapperstein [Wed, 10 May 2017 17:35:44 +0000 (17:35 +0000)]
Merge "Update input method menu to use proper context." into oc-dev

7 years agoMerge "Update startStreaming to return status code" am: 6476ceeaee
Robert Greenwalt [Wed, 10 May 2017 17:35:34 +0000 (17:35 +0000)]
Merge "Update startStreaming to return status code" am: 6476ceeaee
am: a89cacebfb

Change-Id: Ief49d5e046bc9a3396f16ec81a2196a2c3b9557b

7 years agoMerge "Create a new NETWORK_SETTINGS permission" into oc-dev
Rebecca Silberstein [Wed, 10 May 2017 17:35:27 +0000 (17:35 +0000)]
Merge "Create a new NETWORK_SETTINGS permission" into oc-dev
am: ed285e0cd6

Change-Id: Iae9b1317dc53a8213861ff3803764f9d45758f71

7 years agoMerge "Revert "Fixed placemente of Autofill UI for virtual views."" into oc-dev
TreeHugger Robot [Wed, 10 May 2017 17:21:29 +0000 (17:21 +0000)]
Merge "Revert "Fixed placemente of Autofill UI for virtual views."" into oc-dev

7 years agoMerge "Increase limit of locale pairs"
Hall Liu [Wed, 10 May 2017 17:15:31 +0000 (17:15 +0000)]
Merge "Increase limit of locale pairs"
am: aa9a59ab32

Change-Id: I4f9d25169bbd7e53c5396e944613e8c15fe4e308

7 years agoMerge "Update startStreaming to return status code"
Robert Greenwalt [Wed, 10 May 2017 17:11:12 +0000 (17:11 +0000)]
Merge "Update startStreaming to return status code"
am: 6476ceeaee

Change-Id: I92f8fad5bff456b158ba2afd55c3065678b0d5cf

7 years agoMerge "Label the close image button" into oc-dev
TreeHugger Robot [Wed, 10 May 2017 17:10:31 +0000 (17:10 +0000)]
Merge "Label the close image button" into oc-dev

7 years agoMerge changes from topic 'mediaplayer_gc' into oc-dev
Jean-Michel Trivi [Wed, 10 May 2017 16:50:19 +0000 (16:50 +0000)]
Merge changes from topic 'mediaplayer_gc' into oc-dev
am: f86d68d447

Change-Id: I01f8c26e9a61f8ed5dd6f0b3a12d245001756796

7 years agoMerge "Increase limit of locale pairs"
Hall Liu [Wed, 10 May 2017 16:46:18 +0000 (16:46 +0000)]
Merge "Increase limit of locale pairs"

7 years agoMerge "Update startStreaming to return status code"
Treehugger Robot [Wed, 10 May 2017 16:46:12 +0000 (16:46 +0000)]
Merge "Update startStreaming to return status code"

7 years agoNotify ImsService Status Correctly
Brad Ebinger [Sat, 6 May 2017 00:43:41 +0000 (17:43 -0700)]
Notify ImsService Status Correctly

Modifies ImsService to allow multiple status callbacks in
for one ImsFeature. This better handles one ImsFeature
for normal/emergency calling.

Bug: 38001858
Test: Unit Testing
Merged-In: I70ae6f5349aef75aa86d54fe37a3c32459ea3afa
Change-Id: I70ae6f5349aef75aa86d54fe37a3c32459ea3afa

7 years agoMerge "If ENSURE_VERIFY_APPS is enforced, reject installation by default." into oc-dev
TreeHugger Robot [Wed, 10 May 2017 16:44:36 +0000 (16:44 +0000)]
Merge "If ENSURE_VERIFY_APPS is enforced, reject installation by default." into oc-dev

7 years agoNotify ImsService Status Correctly
Brad Ebinger [Sat, 6 May 2017 00:43:41 +0000 (17:43 -0700)]
Notify ImsService Status Correctly

Modifies ImsService to allow multiple status callbacks in
for one ImsFeature. This better handles one ImsFeature
for normal/emergency calling.

Bug: 38001858
Test: Unit Testing
Merged-In: I70ae6f5349aef75aa86d54fe37a3c32459ea3afa
Change-Id: I70ae6f5349aef75aa86d54fe37a3c32459ea3afa

7 years agoMerge "OtaDexoptService: Add missing return" into oc-dev
Andreas Gampe [Wed, 10 May 2017 16:34:58 +0000 (16:34 +0000)]
Merge "OtaDexoptService: Add missing return" into oc-dev
am: ab516db3e6

Change-Id: I18d0be12e680424de3dfb48b0e1e6040e339204e

7 years agoAdd Save and Restore of BluetoothOn setting
Stanley Tng [Tue, 2 May 2017 04:27:31 +0000 (21:27 -0700)]
Add Save and Restore of BluetoothOn setting

This change will automatically save the Bluetooth On setting when
the user chooses to backup the phone settings into the cloud. This
setting is restored by the Setup Wizard (SUW) when configuring the
phone and this change will enable or disable the Bluetooth based
on this restored setting.

Bug: 35657817
Test: Manual test with Sailfish
Change-Id: Ie4518593af63f96f8c363f98941ca5260a3ec4bb

7 years agoMerge "Use application context getting secondary displays." into oc-dev
Bryce Lee [Wed, 10 May 2017 16:27:04 +0000 (16:27 +0000)]
Merge "Use application context getting secondary displays." into oc-dev

7 years agoMerge "Disable parts of tuner from user builds" into oc-dev
TreeHugger Robot [Wed, 10 May 2017 16:19:23 +0000 (16:19 +0000)]
Merge "Disable parts of tuner from user builds" into oc-dev

7 years agoMerge "Update QS mobile data unavailable asset" into oc-dev
TreeHugger Robot [Wed, 10 May 2017 16:16:17 +0000 (16:16 +0000)]
Merge "Update QS mobile data unavailable asset" into oc-dev

7 years agoMerge "Start building SystemApi docs again; exact output." into oc-dev
Jeff Sharkey [Wed, 10 May 2017 16:10:45 +0000 (16:10 +0000)]
Merge "Start building SystemApi docs again; exact output." into oc-dev
am: ab3c811678

Change-Id: I1b45a67f2bc3e76d09f29dc59bc9a6c9dcd3d3d5

7 years agoMerge "Fix brightness dialog background to be light" into oc-dev
TreeHugger Robot [Wed, 10 May 2017 16:09:00 +0000 (16:09 +0000)]
Merge "Fix brightness dialog background to be light" into oc-dev

7 years agoMerge "Allow ogg files to be selected as ringtones" into oc-dev
Christine Franks [Wed, 10 May 2017 16:04:45 +0000 (16:04 +0000)]
Merge "Allow ogg files to be selected as ringtones" into oc-dev
am: d44afb99c8

Change-Id: Ia99142562cd97ad5aeec2dfa40a63d80657a2c0d

7 years agoMerge "Create a new NETWORK_SETTINGS permission" into oc-dev
Rebecca Silberstein [Wed, 10 May 2017 15:43:39 +0000 (15:43 +0000)]
Merge "Create a new NETWORK_SETTINGS permission" into oc-dev

7 years agoMerge "Rename the legacy notification channel" into oc-dev
Julia Reynolds [Wed, 10 May 2017 15:42:21 +0000 (15:42 +0000)]
Merge "Rename the legacy notification channel" into oc-dev
am: 0c34dc60c4

Change-Id: I3e16fc67c83eeb711d795d0b5a72fde0525ee39d

7 years agoMerge changes from topic 'mediaplayer_gc' into oc-dev
Jean-Michel Trivi [Wed, 10 May 2017 15:30:58 +0000 (15:30 +0000)]
Merge changes from topic 'mediaplayer_gc' into oc-dev

* changes:
  IAppOpsCallback has weak reference to PlayerBase
  IPlayer has weak reference to PlayerBase

7 years agoFix battery icon tint in QS during battery saver
Jason Monk [Wed, 10 May 2017 14:39:16 +0000 (10:39 -0400)]
Fix battery icon tint in QS during battery saver

Test: visual
Change-Id: Id844604bfe0de141563781678980da774cc87ebc
Fixes: 37433416

7 years agoMerge "Implement CACert queries in SecurityController" into oc-dev
Philipp Weiß [Wed, 10 May 2017 15:22:07 +0000 (15:22 +0000)]
Merge "Implement CACert queries in SecurityController" into oc-dev
am: 4c78ac9ce4

Change-Id: Ic4a8e36b7f14ad8ebb2b23e76ef6c38f1bc1da72

7 years agoMerge "OtaDexoptService: Add missing return" into oc-dev
TreeHugger Robot [Wed, 10 May 2017 15:18:11 +0000 (15:18 +0000)]
Merge "OtaDexoptService: Add missing return" into oc-dev

7 years agoRevert "Fixed placemente of Autofill UI for virtual views."
Svet Ganov [Wed, 10 May 2017 15:11:33 +0000 (08:11 -0700)]
Revert "Fixed placemente of Autofill UI for virtual views."

This reverts commit 4745fb6b29322819fdcd21647253bfed8e508137.

Change-Id: I07c108dc53d13ff6fdd16f8f486b35d8ca9a7c58

7 years agoLabel the close image button
Svet Ganov [Wed, 10 May 2017 02:10:10 +0000 (19:10 -0700)]
Label the close image button

Test: manual

bug:38182393

Change-Id: I3a1e2e18c651b02b16c8e370b6be9ec2ed5e41e5

7 years agoMerge "Start building SystemApi docs again; exact output." into oc-dev
Jeff Sharkey [Wed, 10 May 2017 15:05:51 +0000 (15:05 +0000)]
Merge "Start building SystemApi docs again; exact output." into oc-dev

7 years agoMerge "Prevent non-fullscreen activities from influencing orientation" into oc-dev
Bryce Lee [Wed, 10 May 2017 15:04:05 +0000 (15:04 +0000)]
Merge "Prevent non-fullscreen activities from influencing orientation" into oc-dev
am: 8a698a1721

Change-Id: I7dd30182184fc5ce6ec5e9750eaa26f174b79b38

7 years agoMerge "Allow ogg files to be selected as ringtones" into oc-dev
Christine Franks [Wed, 10 May 2017 15:03:23 +0000 (15:03 +0000)]
Merge "Allow ogg files to be selected as ringtones" into oc-dev

7 years agoMerge "Enable notifications during an ongoing call" into oc-dev
Daniel Sandler [Wed, 10 May 2017 15:00:20 +0000 (15:00 +0000)]
Merge "Enable notifications during an ongoing call" into oc-dev
am: b94abe5e30

Change-Id: I9d65601fff941d5a3764cde34f9c658ea1d2a435

7 years agoMerge "Rename the legacy notification channel" into oc-dev
Julia Reynolds [Wed, 10 May 2017 14:56:21 +0000 (14:56 +0000)]
Merge "Rename the legacy notification channel" into oc-dev

7 years agoUpdate zen introduction text
Julia Reynolds [Wed, 10 May 2017 14:53:39 +0000 (14:53 +0000)]
Update zen introduction text
am: c12676b449

Change-Id: Ibe776e22adc0fa87817d07547364ac1885e1518c