OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Bluetooth 5 advertising duration refactoring (4/4)" am: 3946df68ed am: 8c5b5b0c4b
Jakub Pawlowski [Sat, 1 Apr 2017 04:54:55 +0000 (04:54 +0000)]
Merge "Bluetooth 5 advertising duration refactoring (4/4)" am: 3946df68ed am: 8c5b5b0c4b
am: 96e331fb1c

Change-Id: I1522cf1e15178f2680f5483e6bb4e0d30be1bb80

7 years agoMerge "Bluetooth 5 advertising duration refactoring (4/4)" am: 3946df68ed
Jakub Pawlowski [Sat, 1 Apr 2017 04:49:26 +0000 (04:49 +0000)]
Merge "Bluetooth 5 advertising duration refactoring (4/4)" am: 3946df68ed
am: 8c5b5b0c4b

Change-Id: Iff286d35a01c180459be652de8a2670c745f49c2

7 years agoMerge "Bluetooth LE Advertising minor improvements" am: 3d84362412 am: 821523d859
Jakub Pawlowski [Sat, 1 Apr 2017 04:49:24 +0000 (04:49 +0000)]
Merge "Bluetooth LE Advertising minor improvements" am: 3d84362412 am: 821523d859
am: bb5310743a

Change-Id: I2dbc765a656a10802a1bba43acf6591dda0f25fe

7 years agoMerge "Bluetooth LE Advertising minor improvements" am: 3d84362412
Jakub Pawlowski [Sat, 1 Apr 2017 04:44:17 +0000 (04:44 +0000)]
Merge "Bluetooth LE Advertising minor improvements" am: 3d84362412
am: 821523d859

Change-Id: I1c10c8099fa6381a163eb3436ac49872399793f3

7 years agoMerge "Bluetooth 5 advertising duration refactoring (4/4)"
Jakub Pawlowski [Sat, 1 Apr 2017 04:42:45 +0000 (04:42 +0000)]
Merge "Bluetooth 5 advertising duration refactoring (4/4)"
am: 3946df68ed

Change-Id: I04f7f867a1387d1816d007ba4bdebf9eecc66b06

7 years agoMerge "Bluetooth LE Advertising minor improvements"
Jakub Pawlowski [Sat, 1 Apr 2017 04:40:10 +0000 (04:40 +0000)]
Merge "Bluetooth LE Advertising minor improvements"
am: 3d84362412

Change-Id: Idc51a6673d8c29a22f9bed177ecb949a49480e3a

7 years agoMerge "Bluetooth 5 advertising duration refactoring (4/4)"
Jakub Pawlowski [Sat, 1 Apr 2017 04:34:50 +0000 (04:34 +0000)]
Merge "Bluetooth 5 advertising duration refactoring (4/4)"

7 years agoBluetooth 5 advertising duration refactoring (4/4)
Jakub Pawlowski [Fri, 31 Mar 2017 02:10:08 +0000 (19:10 -0700)]
Bluetooth 5 advertising duration refactoring (4/4)

Expose both duration and maximum extended advertising events to limit
advertising time.

Test: manual
Bug: 30622771
Change-Id: I44df300995ef985526b93f8c24389775720b3432

7 years agoMerge "Bluetooth LE Advertising minor improvements"
Jakub Pawlowski [Sat, 1 Apr 2017 04:34:30 +0000 (04:34 +0000)]
Merge "Bluetooth LE Advertising minor improvements"

7 years agoBluetooth LE Advertising minor improvements
Jakub Pawlowski [Thu, 30 Mar 2017 18:19:24 +0000 (11:19 -0700)]
Bluetooth LE Advertising minor improvements

This patch adds some additional error checking for the advertising set
parameters, and some more comments.

Test: manual
Bug: 30622771
Change-Id: I87bd44f4179ef63694ad3ed656dc2acc52e40f1e

7 years agoMerge changes from topic 'bitmapfactory-options-outdecodecolorspace' into oc-dev
Romain Guy [Sat, 1 Apr 2017 04:22:17 +0000 (04:22 +0000)]
Merge changes from topic 'bitmapfactory-options-outdecodecolorspace' into oc-dev
am: 81b292abdf

Change-Id: I75e541ec15651f63a47dac8f20e1955548f87f58

7 years agoMerge "Fix tuner sub-screens attach" into oc-dev
Jason Monk [Sat, 1 Apr 2017 04:20:44 +0000 (04:20 +0000)]
Merge "Fix tuner sub-screens attach" into oc-dev
am: 2579ec1b6d

Change-Id: Ifc1863aacc6629728d5160d28c64b45aea9fb6ba

7 years agoMerge changes from topic 'bitmapfactory-options-outdecodecolorspace' into oc-dev
TreeHugger Robot [Sat, 1 Apr 2017 04:17:41 +0000 (04:17 +0000)]
Merge changes from topic 'bitmapfactory-options-outdecodecolorspace' into oc-dev

* changes:
  Documentation for PorterDuffXfermode
  Query color space before decoding a bitmap

7 years agoMerge "Fix tuner sub-screens attach" into oc-dev
TreeHugger Robot [Sat, 1 Apr 2017 04:16:36 +0000 (04:16 +0000)]
Merge "Fix tuner sub-screens attach" into oc-dev

7 years agoMerge "Bluetooth: Add additional BluetoothSocket logging to root cause errors" into...
Ajay Panicker [Sat, 1 Apr 2017 03:44:43 +0000 (03:44 +0000)]
Merge "Bluetooth: Add additional BluetoothSocket logging to root cause errors" into oc-dev
am: 2178f39eea

Change-Id: Ia7b5219b4f3d48954de5960a39590939f9357f6a

7 years agoMerge "Bluetooth: Add additional BluetoothSocket logging to root cause errors" am...
Ajay Panicker [Sat, 1 Apr 2017 03:39:13 +0000 (03:39 +0000)]
Merge "Bluetooth: Add additional BluetoothSocket logging to root cause errors" am: 985fe4cbd2 am: 7eaf518b71
am: 467d572ef1

Change-Id: I779329e4de18db684ffc7020fc80785fc6c8b67f

7 years agoMerge "Bluetooth: Add additional BluetoothSocket logging to root cause errors" into...
TreeHugger Robot [Sat, 1 Apr 2017 03:38:07 +0000 (03:38 +0000)]
Merge "Bluetooth: Add additional BluetoothSocket logging to root cause errors" into oc-dev

7 years agoMerge "Bluetooth: Add additional BluetoothSocket logging to root cause errors" am...
Ajay Panicker [Sat, 1 Apr 2017 03:33:41 +0000 (03:33 +0000)]
Merge "Bluetooth: Add additional BluetoothSocket logging to root cause errors" am: 985fe4cbd2
am: 7eaf518b71

Change-Id: I9d646bf060c704a652a646f68a963a3ef6b36134

7 years agoMerge "Bluetooth: Add additional BluetoothSocket logging to root cause errors"
Ajay Panicker [Sat, 1 Apr 2017 03:28:13 +0000 (03:28 +0000)]
Merge "Bluetooth: Add additional BluetoothSocket logging to root cause errors"
am: 985fe4cbd2

Change-Id: I81f642bae7fe8f1530db6474ebab26760c707fa3

7 years agoMerge "Handle disabled packages as removed." into oc-dev
Makoto Onuki [Sat, 1 Apr 2017 03:22:38 +0000 (03:22 +0000)]
Merge "Handle disabled packages as removed." into oc-dev
am: 2f8f5ffc4b

Change-Id: I75f0e5fd02261d522acb79acc50fc56ef7319eb3

7 years agoMerge "Bluetooth: Add additional BluetoothSocket logging to root cause errors"
Treehugger Robot [Sat, 1 Apr 2017 03:18:45 +0000 (03:18 +0000)]
Merge "Bluetooth: Add additional BluetoothSocket logging to root cause errors"

7 years agoMerge "Handle disabled packages as removed." into oc-dev
TreeHugger Robot [Sat, 1 Apr 2017 03:16:35 +0000 (03:16 +0000)]
Merge "Handle disabled packages as removed." into oc-dev

7 years agoMerge "Add TYPE_PREVIEW in the javadoc of Channels.COLUMN_TYPE" into oc-dev
Chulwoo Lee [Sat, 1 Apr 2017 03:04:39 +0000 (03:04 +0000)]
Merge "Add TYPE_PREVIEW in the javadoc of Channels.COLUMN_TYPE" into oc-dev
am: 0a198d1034

Change-Id: I6c9f14730629c7fe52ce0c52f9127327d1b8a5df

7 years agoMerge changes from topic 'fix_activity_changed_cb-oc-dev_style_things' into oc-dev
Ruben Brunk [Sat, 1 Apr 2017 03:01:10 +0000 (03:01 +0000)]
Merge changes from topic 'fix_activity_changed_cb-oc-dev_style_things' into oc-dev
am: b9dedd43cf

Change-Id: I5a6a29a3dfdf3201594d0712721b1a4490a08018

7 years agoMerge "Add TYPE_PREVIEW in the javadoc of Channels.COLUMN_TYPE" into oc-dev
TreeHugger Robot [Sat, 1 Apr 2017 03:01:00 +0000 (03:01 +0000)]
Merge "Add TYPE_PREVIEW in the javadoc of Channels.COLUMN_TYPE" into oc-dev

7 years agoMerge changes from topic 'fix_activity_changed_cb-oc-dev_style_things' into oc-dev
TreeHugger Robot [Sat, 1 Apr 2017 02:52:08 +0000 (02:52 +0000)]
Merge changes from topic 'fix_activity_changed_cb-oc-dev_style_things' into oc-dev

* changes:
  Switch ActivityRecord to use static imports.
  Fix configuration change state transitions.

7 years agoMerge "Created an HtmlInfo object on ViewStructure." into oc-dev
Felipe Leme [Sat, 1 Apr 2017 02:39:50 +0000 (02:39 +0000)]
Merge "Created an HtmlInfo object on ViewStructure." into oc-dev
am: 4d558930c8

Change-Id: I81b4396e998b375feca626e5c0bc188b5f85cb09

7 years agoMerge "Add documentation about Android TV devices may not support the alarm intents...
Daniel Cardenas [Sat, 1 Apr 2017 02:35:32 +0000 (02:35 +0000)]
Merge "Add documentation about Android TV devices may not support the alarm intents." into oc-dev
am: e3ad0267ca

Change-Id: I438349018fe20642253dafbccbe6bca914914863

7 years agoMerge "Created an HtmlInfo object on ViewStructure." into oc-dev
TreeHugger Robot [Sat, 1 Apr 2017 02:33:56 +0000 (02:33 +0000)]
Merge "Created an HtmlInfo object on ViewStructure." into oc-dev

7 years agoMerge "Add documentation about Android TV devices may not support the alarm intents...
TreeHugger Robot [Sat, 1 Apr 2017 02:28:45 +0000 (02:28 +0000)]
Merge "Add documentation about Android TV devices may not support the alarm intents." into oc-dev

7 years agoMerge "Fix advertise data size estimation" am: 5b2e9f40b4 am: 21bd8d5f2e
Jakub Pawlowski [Sat, 1 Apr 2017 02:24:08 +0000 (02:24 +0000)]
Merge "Fix advertise data size estimation" am: 5b2e9f40b4 am: 21bd8d5f2e
am: b20805d38c

Change-Id: I71ce3e69f8c8c88a4df075b2f7b8de90581c3de4

7 years agoMerge "Fix advertise data size estimation" am: 5b2e9f40b4
Jakub Pawlowski [Sat, 1 Apr 2017 02:19:06 +0000 (02:19 +0000)]
Merge "Fix advertise data size estimation" am: 5b2e9f40b4
am: 21bd8d5f2e

Change-Id: If730c290a7f6745615658edd405877b0441b7d0f

7 years agoMerge "Fix advertise data size estimation"
Jakub Pawlowski [Sat, 1 Apr 2017 02:13:41 +0000 (02:13 +0000)]
Merge "Fix advertise data size estimation"
am: 5b2e9f40b4

Change-Id: Ic6c0a5d5a988ebeedde333910281af54c026f428

7 years agoMerge "Fix advertise data size estimation"
Jakub Pawlowski [Sat, 1 Apr 2017 02:06:30 +0000 (02:06 +0000)]
Merge "Fix advertise data size estimation"

7 years agoDocumentation for PorterDuffXfermode
Romain Guy [Sat, 1 Apr 2017 01:56:37 +0000 (18:56 -0700)]
Documentation for PorterDuffXfermode

It tooks 10 years, but better late than never!

Bug: 32984164
Test: Compiled documentation and checked in Chrome
Change-Id: I6dfd7fba6d3077f8c774b203589083bdbc15f9d2

7 years agoMerge "CTS doesn't like swiping." into oc-dev
Jeff Sharkey [Sat, 1 Apr 2017 01:52:30 +0000 (01:52 +0000)]
Merge "CTS doesn't like swiping." into oc-dev
am: 24ced03e01

Change-Id: I512f09373ce950cc635d2cfed64833bf2fa5c7d3

7 years agoMerge "CTS doesn't like swiping." into oc-dev
TreeHugger Robot [Sat, 1 Apr 2017 01:44:24 +0000 (01:44 +0000)]
Merge "CTS doesn't like swiping." into oc-dev

7 years agoMerge "Be more lenient about live wallpaper unavailability" into oc-dev
Christopher Tate [Sat, 1 Apr 2017 01:07:49 +0000 (01:07 +0000)]
Merge "Be more lenient about live wallpaper unavailability" into oc-dev
am: 8371f96e99

Change-Id: I719b00d1ec1298a3b661665f3785bbcaf221acc9

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Sat, 1 Apr 2017 01:06:52 +0000 (01:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 3d1d01a708  -s ours

Change-Id: Iba8badf1e7a93d1502c6eab8fb9bd9470cac818d

7 years agoMerge "Be more lenient about live wallpaper unavailability" into oc-dev
TreeHugger Robot [Sat, 1 Apr 2017 01:01:51 +0000 (01:01 +0000)]
Merge "Be more lenient about live wallpaper unavailability" into oc-dev

7 years agoMerge "Add SUBSTITUTE_NOTIFICATION_APP_NAME pregrant for Telecom." into oc-dev
Tyler Gunn [Sat, 1 Apr 2017 01:01:00 +0000 (01:01 +0000)]
Merge "Add SUBSTITUTE_NOTIFICATION_APP_NAME pregrant for Telecom." into oc-dev
am: 07891b13f1

Change-Id: I222c241d5e56a12736fa719f74f0a94790802d35

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Sat, 1 Apr 2017 00:56:36 +0000 (00:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

7 years agoMerge "Add SUBSTITUTE_NOTIFICATION_APP_NAME pregrant for Telecom." into oc-dev
Tyler Gunn [Sat, 1 Apr 2017 00:54:21 +0000 (00:54 +0000)]
Merge "Add SUBSTITUTE_NOTIFICATION_APP_NAME pregrant for Telecom." into oc-dev

7 years agoAdd SUBSTITUTE_NOTIFICATION_APP_NAME pregrant for Telecom.
Tyler Gunn [Sat, 1 Apr 2017 00:50:56 +0000 (17:50 -0700)]
Add SUBSTITUTE_NOTIFICATION_APP_NAME pregrant for Telecom.

Test: Manual
Bug: 36817809
Change-Id: I2d7439e3d0040b617a842812b6ae8bda3c32f1ee

7 years agoMerge "Removing unnecessary permission." into oc-dev
Winson Chung [Sat, 1 Apr 2017 00:50:43 +0000 (00:50 +0000)]
Merge "Removing unnecessary permission." into oc-dev
am: 26437c0f22

Change-Id: I877a50a58ede582ee446160b3adbc8713a60b9ee

7 years agoMerge "Fixing rotation issues." into oc-dev
Winson Chung [Sat, 1 Apr 2017 00:49:36 +0000 (00:49 +0000)]
Merge "Fixing rotation issues." into oc-dev
am: 435da2c435

Change-Id: I618887e1760e7fffcc418fc9c137a925b480dd3f

7 years agoMerge "Removing unnecessary permission." into oc-dev
Winson Chung [Sat, 1 Apr 2017 00:42:51 +0000 (00:42 +0000)]
Merge "Removing unnecessary permission." into oc-dev

7 years agoMerge "Fixing rotation issues." into oc-dev
TreeHugger Robot [Sat, 1 Apr 2017 00:41:21 +0000 (00:41 +0000)]
Merge "Fixing rotation issues." into oc-dev

7 years agoMerge "Use correct binding flags when reconnecting to IME" into oc-dev
Yohei Yukawa [Sat, 1 Apr 2017 00:15:11 +0000 (00:15 +0000)]
Merge "Use correct binding flags when reconnecting to IME" into oc-dev
am: 13df64aa8e

Change-Id: I95b199b5d06a66051367feb51aa8c578b7e29245

7 years agoMerge "Use variable fonts for Noto Sans Khmer" into oc-dev
Jungshik Shin [Sat, 1 Apr 2017 00:11:51 +0000 (00:11 +0000)]
Merge "Use variable fonts for Noto Sans Khmer" into oc-dev
am: f9f1f1c1c3

Change-Id: I0db841fa0079d5f402b5a8e960c21effd18d3c8c

7 years agoMerge "Moar pre-partitioning refactoring." into oc-dev
Felipe Leme [Sat, 1 Apr 2017 00:09:26 +0000 (00:09 +0000)]
Merge "Moar pre-partitioning refactoring." into oc-dev
am: 92f76ba958

Change-Id: Ia6c04764c0df183849abb2e95254bc38b84c1c99

7 years agoMerge "Use correct binding flags when reconnecting to IME" into oc-dev
TreeHugger Robot [Sat, 1 Apr 2017 00:06:57 +0000 (00:06 +0000)]
Merge "Use correct binding flags when reconnecting to IME" into oc-dev

7 years agoMerge changes from topic 'launch-2d-activities-vr' into oc-dev
Karthik Ravi Shankar [Sat, 1 Apr 2017 00:01:31 +0000 (00:01 +0000)]
Merge changes from topic 'launch-2d-activities-vr' into oc-dev
am: f04d039584

Change-Id: I820ec3a9c1379bf9bcc688e36bcfeb00ac753a22

7 years agoMerge "Use variable fonts for Noto Sans Khmer" into oc-dev
TreeHugger Robot [Sat, 1 Apr 2017 00:00:48 +0000 (00:00 +0000)]
Merge "Use variable fonts for Noto Sans Khmer" into oc-dev

7 years agoAdd vr persistent mode enable/disable
Karthik Ravi Shankar [Sat, 1 Apr 2017 00:00:38 +0000 (00:00 +0000)]
Add vr persistent mode enable/disable
am: 74db2a3667

Change-Id: Id2d298582d4a1ecb4d22d43b6265e008752eda77

7 years agoLaunch 2D activities in VR mode
Karthik Ravi Shankar [Fri, 31 Mar 2017 23:59:22 +0000 (23:59 +0000)]
Launch 2D activities in VR mode
am: 99493dbc94

Change-Id: I33c4458ca441b8e95d45516cce2bcb7eb020ee3f

7 years agoHandle disabled packages as removed.
Makoto Onuki [Fri, 31 Mar 2017 23:58:26 +0000 (16:58 -0700)]
Handle disabled packages as removed.

Bug 36600272
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest10 -w com.android.frameworks.servicestests

Change-Id: I272334cef00337d5ba01ce4b878c799d9476432f

7 years agoFix advertise data size estimation
Jakub Pawlowski [Fri, 31 Mar 2017 23:49:13 +0000 (16:49 -0700)]
Fix advertise data size estimation

UUID in service data field can be 2, 4, or 16 bytes long.

Test: manual
Bug: 36553478
Change-Id: Ib5ba2d16065496ca311e8642a15a7ea6bc84d4c1

7 years agoMerge "Moar pre-partitioning refactoring." into oc-dev
TreeHugger Robot [Fri, 31 Mar 2017 23:51:58 +0000 (23:51 +0000)]
Merge "Moar pre-partitioning refactoring." into oc-dev

7 years agoMerge changes from topic 'launch-2d-activities-vr' into oc-dev
TreeHugger Robot [Fri, 31 Mar 2017 23:48:18 +0000 (23:48 +0000)]
Merge changes from topic 'launch-2d-activities-vr' into oc-dev

* changes:
  Allow shell uid to access Vr APIs
  Add vr persistent mode enable/disable
  Launch 2D activities in VR mode

7 years agoAdd documentation about Android TV devices may not support the alarm
Daniel Cardenas [Fri, 31 Mar 2017 23:29:11 +0000 (16:29 -0700)]
Add documentation about Android TV devices may not support the alarm
intents.

Bug: 36003137

Test: Build
Change-Id: Ia469f6e066c7aa9ed1ebcda3ea12fb3254654fb6

7 years agoMerge "Implement issue #36590595: Add ability to associated a ClipData with JobInfo...
Dianne Hackborn [Fri, 31 Mar 2017 23:29:01 +0000 (23:29 +0000)]
Merge "Implement issue #36590595: Add ability to associated a ClipData with JobInfo" into oc-dev
am: 2d161b1d3f

Change-Id: I4aed07a3ad88f3b171e92aaa70f88bcc4da131b8

7 years agoMerge "QS: Add transient icon for hotspot" into oc-dev
Jason Monk [Fri, 31 Mar 2017 23:26:08 +0000 (23:26 +0000)]
Merge "QS: Add transient icon for hotspot" into oc-dev
am: cf6fa5e951

Change-Id: Idc3873203538e1927c778ba1a2a34351921101e6

7 years agoMerge "Implement issue #36590595: Add ability to associated a ClipData with JobInfo...
TreeHugger Robot [Fri, 31 Mar 2017 23:21:07 +0000 (23:21 +0000)]
Merge "Implement issue #36590595: Add ability to associated a ClipData with JobInfo" into oc-dev

7 years agoMerge "QS: Add transient icon for hotspot" into oc-dev
TreeHugger Robot [Fri, 31 Mar 2017 23:18:40 +0000 (23:18 +0000)]
Merge "QS: Add transient icon for hotspot" into oc-dev

7 years agoMerge "Ensure we show the PiP menu in response to KEYCODE_WINDOW." into oc-dev
Winson Chung [Fri, 31 Mar 2017 23:14:57 +0000 (23:14 +0000)]
Merge "Ensure we show the PiP menu in response to KEYCODE_WINDOW." into oc-dev
am: 2af994ec03

Change-Id: I6abd868698fb9f7b16e62938e608f75fb2d610f4

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Fri, 31 Mar 2017 23:13:43 +0000 (23:13 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 4eb9a6dbcb  -s ours

Change-Id: If8806b983b3402874e90a9e94a406a3a41bf21f6

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Fri, 31 Mar 2017 23:12:48 +0000 (23:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 4de7204ecc  -s ours

Change-Id: Id1cce0985649693a270b0f00009f100d8754e226

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Fri, 31 Mar 2017 23:09:16 +0000 (23:09 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 4fafb85225  -s ours

Change-Id: I22b22ec2a299d24a2fcccfba3e79b1e4ae937e40

7 years agoMerge "Ensure we show the PiP menu in response to KEYCODE_WINDOW." into oc-dev
TreeHugger Robot [Fri, 31 Mar 2017 23:07:20 +0000 (23:07 +0000)]
Merge "Ensure we show the PiP menu in response to KEYCODE_WINDOW." into oc-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Fri, 31 Mar 2017 23:06:55 +0000 (23:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

7 years agoSwitch ActivityRecord to use static imports.
Ruben Brunk [Tue, 28 Mar 2017 03:26:17 +0000 (20:26 -0700)]
Switch ActivityRecord to use static imports.

- Per comments from ogunwale,jjaggi on ag/2016938, static imports
  are preferred when possible, and are part of Android's tacit style guide.

Bug: 36662390
Test: Covered by existing unit tests.

Change-Id: Ic3897dd7a4a9cb665fc3d8c7a171f74494f02a2e

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Fri, 31 Mar 2017 23:04:18 +0000 (23:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

7 years agoFix configuration change state transitions.
Ruben Brunk [Thu, 23 Mar 2017 05:03:25 +0000 (22:03 -0700)]
Fix configuration change state transitions.

- Do not ever do onDestroy/onCreate cycle for VR activities when
  configuration is changed due to VR mode UI change.
- Do not gate on global configuration change check, as updates
  to the global UI mode configuration can race with activity
  lifecycle changes.

Bug: 36491752
Bug: 36515684

Test: Manually checked activity lifecycle for pre-O, O VR apks.

Change-Id: Ic2739c6e78c1bdfe876bf1302cd0adeaadece15c

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Fri, 31 Mar 2017 23:01:28 +0000 (23:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

7 years agoBluetooth: Add additional BluetoothSocket logging to root cause errors
Ajay Panicker [Tue, 28 Mar 2017 21:28:27 +0000 (14:28 -0700)]
Bluetooth: Add additional BluetoothSocket logging to root cause errors

Bug: 34780400
Test: Code still compiles
Change-Id: I166842ecc6889f9ea403e7aa3678ed818cd80968

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Fri, 31 Mar 2017 22:30:45 +0000 (22:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am: ddd95360a2  -s ours

Change-Id: Idaf543bfcbad9b802e10a78c29aa49cbf522ad1d

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Fri, 31 Mar 2017 22:23:54 +0000 (22:23 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

7 years agoBluetooth: Add additional BluetoothSocket logging to root cause errors
Ajay Panicker [Tue, 28 Mar 2017 21:28:27 +0000 (14:28 -0700)]
Bluetooth: Add additional BluetoothSocket logging to root cause errors

Bug: 34780400
Test: Code still compiles
Change-Id: I166842ecc6889f9ea403e7aa3678ed818cd80968

7 years agoRemoving unnecessary permission.
Winson Chung [Fri, 31 Mar 2017 19:48:28 +0000 (12:48 -0700)]
Removing unnecessary permission.

Bug: 36507456
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testFinishPipActivityWithTaskOverlay
Change-Id: I351b7afd648ceb0a200c01fa318c9a56dbe64a96

7 years agoFixing rotation issues.
Winson Chung [Fri, 31 Mar 2017 01:15:30 +0000 (18:15 -0700)]
Fixing rotation issues.

- Ensuring that we can update the stack bounds of non-docked stacks upon
  rotation while split screen is enabled (previously disabled)
- Fix issue where subsequent bounds calculations were using the animation
  target bounds from the prior orientation

Bug: 36657966
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: I810e35f907721ef5c781b914adac3273ea8da5c8

7 years agoBe more lenient about live wallpaper unavailability
Christopher Tate [Fri, 31 Mar 2017 19:28:30 +0000 (12:28 -0700)]
Be more lenient about live wallpaper unavailability

- Give the app 5 more seconds to restart following a crash
- Presume that system-default wallpapers are robust, and don't fall back
  to showing nothing at all if timing or update problems arise
- Improve logging about static imagery handling during boot
- For now, turn on a bit more logging about wallpaper activity

Bug 36573894
Bug 34979999
Test: manual

Change-Id: I787a351f1251b83451d55bb98a4e0de9ce17836a

7 years agoMerge "Add feature constants in Call Log provider to identify HD and WIFI calls....
Tyler Gunn [Fri, 31 Mar 2017 20:21:19 +0000 (20:21 +0000)]
Merge "Add feature constants in Call Log provider to identify HD and WIFI calls." into oc-dev
am: 9220ff1f5a

Change-Id: I2bfe8a64253b73d26377985768d5a6aa4b470dc6

7 years agoMerge "Add 'am start-foreground-service' shell command" into oc-dev
Christopher Tate [Fri, 31 Mar 2017 20:20:11 +0000 (20:20 +0000)]
Merge "Add 'am start-foreground-service' shell command" into oc-dev
am: 1157116b0c

Change-Id: Iefc320f2bd053e98cd7ec4b4f3df3f1492b417e9

7 years agoMerge "Add feature constants in Call Log provider to identify HD and WIFI calls....
Tyler Gunn [Fri, 31 Mar 2017 20:14:53 +0000 (20:14 +0000)]
Merge "Add feature constants in Call Log provider to identify HD and WIFI calls." into oc-dev

7 years agoMerge "Add 'am start-foreground-service' shell command" into oc-dev
TreeHugger Robot [Fri, 31 Mar 2017 20:14:46 +0000 (20:14 +0000)]
Merge "Add 'am start-foreground-service' shell command" into oc-dev

7 years agoAdd feature constants in Call Log provider to identify HD and WIFI calls.
BIN ZHOU [Fri, 31 Mar 2017 16:54:04 +0000 (11:54 -0500)]
Add feature constants in Call Log provider to identify HD and WIFI calls.

Makes use of existing features column in the provider.

Test: Manual
Bug: 35359461
Change-Id: I405893771a2dac2bb25a54065238917ac2d515c8

7 years agoMerge "restore the title string un UsbDeviceManager" into oc-dev
Chris Wren [Fri, 31 Mar 2017 19:58:59 +0000 (19:58 +0000)]
Merge "restore the title string un UsbDeviceManager" into oc-dev
am: b0db4017e5

Change-Id: Ia3610251a9fa31b179bee8b5bae21dc24c3bed65

7 years agoMerge "Include likely IMEs in ANR dumping" into oc-dev
Brian Carlstrom [Fri, 31 Mar 2017 19:58:00 +0000 (19:58 +0000)]
Merge "Include likely IMEs in ANR dumping" into oc-dev
am: 794eeebd55

Change-Id: Ia9dafd2603dc902b4d5d4cd8d3baa29465f52a53

7 years agoUse correct binding flags when reconnecting to IME
Yohei Yukawa [Thu, 30 Mar 2017 22:57:02 +0000 (15:57 -0700)]
Use correct binding flags when reconnecting to IME

Since ICS MR-1 [1], InputMethodManagerService (IMMS) establishes two
connections to an IME: one is for general connection and the other to
allow the system to adjust the IME's performance characteristics much
more like a foreground activity. The tricky point is that the former
connection can be re-connected not only IMMS#startInputInnerLocked() in
but also in IMMS#showCurrentInputLocked().

It turns out that some previous attempts to adjust BIND_ flags for the
former connection [2][3] were not applied to
IMMS#showCurrentInputLocked().  This CL addresses that inconsistency by
make it clear that IMMS establishes up to connections to the IME.

 [1]: Id1f73de66dc93d63212183958a72119ad174318b
      2c84cfc001fb92a71811bf7384b7f865ff31ff9d
 [2]: I1724113f42abe7862e8aecb6faae5a7620245e89
      c8230519728b14065effd3b7d4eca273ff86160c
 [3]: Ie5793fd9b40d980fa18f80246326511ed6ae0597
      f0f94d129b6eb3c48624e915898d86d4f2de59ff

Test: Manuall tested as follows.
      1. Build and flash an OS image.
      2. Complete the setup wizard (if any).
      3. tapas LatinIME && make -j
      4. adb install -r out/target/product/generic/system/app/LatinIME/LatinIME.apk
      5. Run a test program that keeps calling IMM#showSoftInput()
      6. adb shell ime enable com.android.inputmethod.latin/.LatinIME
      7. adb shell ime set com.android.inputmethod.latin/.LatinIME
      8. adb shell dumpsys activity processes android
         Make sure that there is a ConnectionRecord to
         com.android.inputmethod.latin that has "CR !FG UI !VIS" bits.
      9. adb install -r out/target/product/generic/system/app/LatinIME/LatinIME.apk
     10. adb shell dumpsys activity processes android
         Make sure that there is a ConnectionRecord to
         com.android.inputmethod.latin that has "CR !FG UI !VIS" bits.
Fixes: 36727763
Change-Id: Ib7fa34b21e1fb8bb5b19a9b08e36d0565f3dd266

7 years agoMerge "Add null check to InputMonitor.notifyANR" into oc-dev
Brian Carlstrom [Fri, 31 Mar 2017 19:53:42 +0000 (19:53 +0000)]
Merge "Add null check to InputMonitor.notifyANR" into oc-dev
am: 15010f2bd1

Change-Id: I95e8ad62dbea783056e14780a4daeba44ff93406

7 years agoMerge "restore the title string un UsbDeviceManager" into oc-dev
Chris Wren [Fri, 31 Mar 2017 19:49:04 +0000 (19:49 +0000)]
Merge "restore the title string un UsbDeviceManager" into oc-dev

7 years agoMerge "Include likely IMEs in ANR dumping" into oc-dev
Brian Carlstrom [Fri, 31 Mar 2017 19:46:48 +0000 (19:46 +0000)]
Merge "Include likely IMEs in ANR dumping" into oc-dev

7 years agoMerge "Add null check to InputMonitor.notifyANR" into oc-dev
Brian Carlstrom [Fri, 31 Mar 2017 19:46:13 +0000 (19:46 +0000)]
Merge "Add null check to InputMonitor.notifyANR" into oc-dev

7 years agorestore the title string un UsbDeviceManager
Chris Wren [Fri, 31 Mar 2017 19:37:45 +0000 (15:37 -0400)]
restore the title string un UsbDeviceManager

Bug: 32584866
Test: make
Change-Id: I4e4dea064a1af194db5660b0765cc4c4b666584a

7 years agoUse variable fonts for Noto Sans Khmer
Jungshik Shin [Fri, 17 Mar 2017 21:56:17 +0000 (14:56 -0700)]
Use variable fonts for Noto Sans Khmer

Update fonts.xml to use NotoSansKhmer-VF.ttf.

The weight range of Khmer is also extended to have 9 weight instances
(three more than Roboto with 200, 600 and 800).

The width range for Khmer is left alone partly because of an apparent
lack of support in fonts.xml for non-normal width fallback fonts.

Note that Noto Sans Khmer UI is left alone because of a baseline issue.

BUG: 22667753
Test: See the QA instruction in comment 10 of the bug.
Test: fontchain_lint
Change-Id: Idf6d4fec86822663ac08feb8979edacbc6c709a0

7 years agoMerge "Update default max time of waiting for network state to get updated." into...
Sudheer Shanka [Fri, 31 Mar 2017 19:08:35 +0000 (19:08 +0000)]
Merge "Update default max time of waiting for network state to get updated." into oc-dev
am: f2cd4371fe

Change-Id: I8e11ab25744c48faa5831a0974bf6fb711482acf

7 years agoMerge "Update default max time of waiting for network state to get updated." into...
Sudheer Shanka [Fri, 31 Mar 2017 19:03:07 +0000 (19:03 +0000)]
Merge "Update default max time of waiting for network state to get updated." into oc-dev

7 years agoMerge "Introduce Authentication Failure reason codes" into oc-dev
Sohani Rao [Fri, 31 Mar 2017 18:55:37 +0000 (18:55 +0000)]
Merge "Introduce Authentication Failure reason codes" into oc-dev
am: 398b37539b

Change-Id: I398f105602a12485282198df541cc6f4ef786bee

7 years agoMerge "Introduce Authentication Failure reason codes" into oc-dev
Sohani Rao [Fri, 31 Mar 2017 18:51:12 +0000 (18:51 +0000)]
Merge "Introduce Authentication Failure reason codes" into oc-dev