OSDN Git Service

android-x86/frameworks-base.git
7 years agoUpdate UnlockMethodCache when screen turns off am: 08ae664365
Kevin Chyn [Thu, 31 Aug 2017 13:11:33 +0000 (13:11 +0000)]
Update UnlockMethodCache when screen turns off am: 08ae664365
am: 0550bddc95

Change-Id: Ie22adb274db36add9172ab53366517121f7dc7e3

7 years agoUpdate UnlockMethodCache when screen turns off
Kevin Chyn [Thu, 31 Aug 2017 12:59:00 +0000 (12:59 +0000)]
Update UnlockMethodCache when screen turns off
am: 08ae664365

Change-Id: I416497c2ffeca295b9620a6d1d6f9868935dd25a

7 years agoMerge "Skip handling recents toggle if a task is locked." into oc-mr1-dev
Winson Chung [Thu, 31 Aug 2017 04:46:29 +0000 (04:46 +0000)]
Merge "Skip handling recents toggle if a task is locked." into oc-mr1-dev
am: 8d1a86ca0f

Change-Id: I6e240465679b5050fdbcb6030e6a281fd5c27719

7 years agoMerge "Skip handling recents toggle if a task is locked." into oc-mr1-dev
TreeHugger Robot [Thu, 31 Aug 2017 04:34:43 +0000 (04:34 +0000)]
Merge "Skip handling recents toggle if a task is locked." into oc-mr1-dev

7 years agoMerge "Use isolated uid to set oom_score_adj" into oc-mr1-dev
Kenichi Ishibashi [Thu, 31 Aug 2017 04:12:40 +0000 (04:12 +0000)]
Merge "Use isolated uid to set oom_score_adj" into oc-mr1-dev
am: d60e2ede49

Change-Id: I5416ba83137d9983f4c76176c68abd8cf31f696d

7 years agoMerge "Shutdown more reliably" am: 549c3d2e4f am: 7e5b415861
Erik Kline [Thu, 31 Aug 2017 03:57:57 +0000 (03:57 +0000)]
Merge "Shutdown more reliably" am: 549c3d2e4f am: 7e5b415861
am: 024d6b8910

Change-Id: Ia05dcf01d2809a32c78b1a6a0826758f11555fa3

7 years agoMerge "Use isolated uid to set oom_score_adj" into oc-mr1-dev
TreeHugger Robot [Thu, 31 Aug 2017 03:52:51 +0000 (03:52 +0000)]
Merge "Use isolated uid to set oom_score_adj" into oc-mr1-dev

7 years agoMerge "Shutdown more reliably" am: 549c3d2e4f
Erik Kline [Thu, 31 Aug 2017 03:45:23 +0000 (03:45 +0000)]
Merge "Shutdown more reliably" am: 549c3d2e4f
am: 7e5b415861

Change-Id: Id2bd17e649d28cc484292e1f1ec5644c014bc395

7 years agoMerge "Shutdown more reliably"
Erik Kline [Thu, 31 Aug 2017 03:30:55 +0000 (03:30 +0000)]
Merge "Shutdown more reliably"
am: 549c3d2e4f

Change-Id: I9ff7e6ee49bb88f9a63b269d57d5e91ed6ddec31

7 years agoMerge "Update icons to have rounded corner" into oc-mr1-dev
Fan Zhang [Thu, 31 Aug 2017 03:24:29 +0000 (03:24 +0000)]
Merge "Update icons to have rounded corner" into oc-mr1-dev
am: e61844e265

Change-Id: I310ca32a0c418a7631eeb4303221613ce25c74ed

7 years agoMerge "At STARTED_AS_NEXT, offload MediaPlayer.start() to a separate thread" into...
Wonsik Kim [Thu, 31 Aug 2017 03:13:34 +0000 (03:13 +0000)]
Merge "At STARTED_AS_NEXT, offload MediaPlayer.start() to a separate thread" into oc-mr1-dev
am: 52700a9795

Change-Id: I1691d29774c95fc87c1230ec85fbcf78838e6e42

7 years agoMerge "Update icons to have rounded corner" into oc-mr1-dev
TreeHugger Robot [Thu, 31 Aug 2017 03:12:24 +0000 (03:12 +0000)]
Merge "Update icons to have rounded corner" into oc-mr1-dev

7 years agoMerge "Shutdown more reliably"
Treehugger Robot [Thu, 31 Aug 2017 03:11:51 +0000 (03:11 +0000)]
Merge "Shutdown more reliably"

7 years agoMerge "At STARTED_AS_NEXT, offload MediaPlayer.start() to a separate thread" into...
TreeHugger Robot [Thu, 31 Aug 2017 02:50:04 +0000 (02:50 +0000)]
Merge "At STARTED_AS_NEXT, offload MediaPlayer.start() to a separate thread" into oc-mr1-dev

7 years agoMerge "WebView: fix setSafeBrowsingWhitelist table in docs" into oc-mr1-dev
Nate Fischer [Thu, 31 Aug 2017 02:40:22 +0000 (02:40 +0000)]
Merge "WebView: fix setSafeBrowsingWhitelist table in docs" into oc-mr1-dev
am: 0899236129

Change-Id: I7ef05d97811a5ca15a3bfc01d8743c28fbefd243

7 years agoMerge "WebView: fix setSafeBrowsingWhitelist table in docs" into oc-mr1-dev
TreeHugger Robot [Thu, 31 Aug 2017 02:28:11 +0000 (02:28 +0000)]
Merge "WebView: fix setSafeBrowsingWhitelist table in docs" into oc-mr1-dev

7 years agoUpdate UnlockMethodCache when screen turns off
Kevin Chyn [Thu, 31 Aug 2017 02:02:43 +0000 (19:02 -0700)]
Update UnlockMethodCache when screen turns off

Fixes: 65212307

Test: 1) add a temporary log in update()
2) turn off screen, make sure update() is called, and
   canSkipBouncer value is updated and correct

Change-Id: I576d2375d38e83f286ad1fc6aa25944326c3ef8f

7 years agoMerge "Adjusting PiP for the TV IME." into oc-mr1-dev
Winson Chung [Thu, 31 Aug 2017 01:41:51 +0000 (01:41 +0000)]
Merge "Adjusting PiP for the TV IME." into oc-mr1-dev
am: ca468f1983

Change-Id: I0869d84d5c7a41f7088dc27ca2e2e8355794c4bc

7 years agoMerge "Adjusting PiP for the TV IME." into oc-mr1-dev
TreeHugger Robot [Thu, 31 Aug 2017 01:23:03 +0000 (01:23 +0000)]
Merge "Adjusting PiP for the TV IME." into oc-mr1-dev

7 years agoMerge "Fix up bar transitions on low end devices" into oc-mr1-dev
Jason Monk [Thu, 31 Aug 2017 01:13:22 +0000 (01:13 +0000)]
Merge "Fix up bar transitions on low end devices" into oc-mr1-dev
am: e087252671

Change-Id: I5c66f38c731585cf7c3b05b6f5c64d5286931757

7 years agoMerge "Fix up bar transitions on low end devices" into oc-mr1-dev
TreeHugger Robot [Thu, 31 Aug 2017 01:03:26 +0000 (01:03 +0000)]
Merge "Fix up bar transitions on low end devices" into oc-mr1-dev

7 years agoMerge "Fixes NPE thrown in sort if new targets are added." into oc-mr1-dev
Kang Li [Thu, 31 Aug 2017 00:52:18 +0000 (00:52 +0000)]
Merge "Fixes NPE thrown in sort if new targets are added." into oc-mr1-dev
am: f10b0d000e

Change-Id: I6befef8d1f27666e5a6c721378ba5c02cc769947

7 years agoMerge "Fixes NPE thrown in sort if new targets are added." into oc-mr1-dev
TreeHugger Robot [Thu, 31 Aug 2017 00:34:57 +0000 (00:34 +0000)]
Merge "Fixes NPE thrown in sort if new targets are added." into oc-mr1-dev

7 years agoAt STARTED_AS_NEXT, offload MediaPlayer.start() to a separate thread
Wonsik Kim [Wed, 30 Aug 2017 23:28:01 +0000 (16:28 -0700)]
At STARTED_AS_NEXT, offload MediaPlayer.start() to a separate thread

Fixes: 65210445
Fixes: 64915666
Test: adb shell am instrument -e size small -w 'android.media.cts/android.support.test.runner.AndroidJUnitRunner'
Change-Id: I73f1cebdd4b990e28f8d466f129e781cba2b5bbf

7 years agoMerge "ATV a11y shortcut (CL 1 of 3): Update key chord" into oc-mr1-dev
Zhen Sun [Thu, 31 Aug 2017 00:12:12 +0000 (00:12 +0000)]
Merge "ATV a11y shortcut (CL 1 of 3): Update key chord" into oc-mr1-dev
am: 9174e87722

Change-Id: I1afc6fc7cc2faa929dd343b8cb9caead024e6dc1

7 years agoMerge "Add static lock in PowerProfile" into oc-mr1-dev
jackqdyulei [Thu, 31 Aug 2017 00:06:06 +0000 (00:06 +0000)]
Merge "Add static lock in PowerProfile" into oc-mr1-dev
am: dcadf1934a

Change-Id: I3ae1a99852d5c9c4a87ee402b3e2e1cc88b8bd0d

7 years agoMerge "resolve merge conflicts of 490d397d284f to oc-dr1-dev" into oc-dr1-dev am...
Phil Weaver [Wed, 30 Aug 2017 23:56:13 +0000 (23:56 +0000)]
Merge "resolve merge conflicts of 490d397d284f to oc-dr1-dev" into oc-dr1-dev am: 0ddaa63b67
am: 666e08ab15  -s ours

Change-Id: Ie37024fa53efb6a243b4bad6bd9e826005630d1e

7 years agoMerge "resolve merge conflicts of 490d397d284f to oc-dr1-dev" into oc-dr1-dev am...
Phil Weaver [Wed, 30 Aug 2017 23:46:49 +0000 (23:46 +0000)]
Merge "resolve merge conflicts of 490d397d284f to oc-dr1-dev" into oc-dr1-dev am: 0ddaa63b67  -s ours
am: 3eda5f4fe8  -s ours

Change-Id: I9eadb28fed6d9e1e7dda322467508449ac12bd59

7 years agoUpdate icons to have rounded corner
Fan Zhang [Wed, 30 Aug 2017 23:41:20 +0000 (16:41 -0700)]
Update icons to have rounded corner

Bug: 65204006
Test: visual
Change-Id: I97baac238495b5a03e91edb18e0a3482f67edf71

7 years agoMerge "Add heif format to ExifInterface" into oc-mr1-dev
Chong Zhang [Wed, 30 Aug 2017 23:40:46 +0000 (23:40 +0000)]
Merge "Add heif format to ExifInterface" into oc-mr1-dev
am: e034a1f5ed

Change-Id: I36fb2559b52bb778acff72954012704da8a85ff9

7 years agoMerge "resolve merge conflicts of 490d397d284f to oc-dr1-dev" into oc-dr1-dev
Phil Weaver [Wed, 30 Aug 2017 23:40:22 +0000 (23:40 +0000)]
Merge "resolve merge conflicts of 490d397d284f to oc-dr1-dev" into oc-dr1-dev
am: 0ddaa63b67

Change-Id: I84cdc92d542597541266fe506b4a3af160d970b2

7 years agoMerge "ATV a11y shortcut (CL 1 of 3): Update key chord" into oc-mr1-dev
Zhen Sun [Wed, 30 Aug 2017 23:37:44 +0000 (23:37 +0000)]
Merge "ATV a11y shortcut (CL 1 of 3): Update key chord" into oc-mr1-dev

7 years agoMerge "Add static lock in PowerProfile" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 23:35:07 +0000 (23:35 +0000)]
Merge "Add static lock in PowerProfile" into oc-mr1-dev

7 years agoMerge "resolve merge conflicts of 490d397d284f to oc-dr1-dev" into oc-dr1-dev
Phil Weaver [Wed, 30 Aug 2017 23:10:03 +0000 (23:10 +0000)]
Merge "resolve merge conflicts of 490d397d284f to oc-dr1-dev" into oc-dr1-dev
am: 0ddaa63b67  -s ours

Change-Id: Id403b03e837eafab80ed20271543e82cb74c260b

7 years agoMerge "Don't touch auto dim on app change" into oc-mr1-dev
Jason Monk [Wed, 30 Aug 2017 23:06:01 +0000 (23:06 +0000)]
Merge "Don't touch auto dim on app change" into oc-mr1-dev
am: f7dc1a3290

Change-Id: I25ead35722e66e27361f47eca9ee440bc6b14494

7 years agoMerge "Add heif format to ExifInterface" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 23:05:12 +0000 (23:05 +0000)]
Merge "Add heif format to ExifInterface" into oc-mr1-dev

7 years agoMerge "Update night display intensity coefficients" into oc-mr1-dev
Christine Franks [Wed, 30 Aug 2017 22:58:41 +0000 (22:58 +0000)]
Merge "Update night display intensity coefficients" into oc-mr1-dev
am: 0bb97d9e0b

Change-Id: I858cc44d6037c3b3c33007f71b0721a5663c0740

7 years agoMerge "resolve merge conflicts of 490d397d284f to oc-dr1-dev" into oc-dr1-dev
Phil Weaver [Wed, 30 Aug 2017 22:54:59 +0000 (22:54 +0000)]
Merge "resolve merge conflicts of 490d397d284f to oc-dr1-dev" into oc-dr1-dev

7 years agoMerge "Introduce SmartSelectionEventTracker." into oc-mr1-dev
Abodunrinwa Toki [Wed, 30 Aug 2017 22:52:23 +0000 (22:52 +0000)]
Merge "Introduce SmartSelectionEventTracker." into oc-mr1-dev
am: 16da1f545c

Change-Id: Ie527776ced88acf1139ac200b3a855bcd9beb76c

7 years agoMerge "Don't touch auto dim on app change" into oc-mr1-dev
Jason Monk [Wed, 30 Aug 2017 22:44:35 +0000 (22:44 +0000)]
Merge "Don't touch auto dim on app change" into oc-mr1-dev

7 years agoMerge "Adding USB audio-class 2.0 spec descriptors." into oc-mr1-dev
Paul Mclean [Wed, 30 Aug 2017 22:41:53 +0000 (22:41 +0000)]
Merge "Adding USB audio-class 2.0 spec descriptors." into oc-mr1-dev
am: 87cb6d806e

Change-Id: I0a673c8b72d80813f9542d3c122debdc1c1cbef7

7 years agoMerge "BatteryStats: Don't schedule work when shutting down" into oc-mr1-dev
Adam Lesinski [Wed, 30 Aug 2017 22:35:40 +0000 (22:35 +0000)]
Merge "BatteryStats: Don't schedule work when shutting down" into oc-mr1-dev
am: 4a8f95ba56

Change-Id: Ia71160c03ec0859cdf93082fc6ced121452a3ad6

7 years agoMerge "Update night display intensity coefficients" into oc-mr1-dev
Christine Franks [Wed, 30 Aug 2017 22:33:01 +0000 (22:33 +0000)]
Merge "Update night display intensity coefficients" into oc-mr1-dev

7 years agoMerge "Introduce SmartSelectionEventTracker." into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 22:13:58 +0000 (22:13 +0000)]
Merge "Introduce SmartSelectionEventTracker." into oc-mr1-dev

7 years agoMerge "Adding USB audio-class 2.0 spec descriptors." into oc-mr1-dev
Paul Mclean [Wed, 30 Aug 2017 22:13:36 +0000 (22:13 +0000)]
Merge "Adding USB audio-class 2.0 spec descriptors." into oc-mr1-dev

7 years agoMerge "BatteryStats: Don't schedule work when shutting down" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 22:11:52 +0000 (22:11 +0000)]
Merge "BatteryStats: Don't schedule work when shutting down" into oc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Wed, 30 Aug 2017 22:11:11 +0000 (22:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: d9abde75e8  -s ours

Change-Id: Ie47998650cb3304201d7cedac9d5cea1015c14eb

7 years agoMerge "Make slight API and doc adjustments" into oc-mr1-dev
Hall Liu [Wed, 30 Aug 2017 22:00:00 +0000 (22:00 +0000)]
Merge "Make slight API and doc adjustments" into oc-mr1-dev
am: 1407bdd635  -s ours

Change-Id: I1207989a31cc91ca07a82fedd307a05581085b2b

7 years agoMerge "Merge "IllegalArgumentException in MagnificationGestureHandler" am: 7aff46195e...
Android Build Merger (Role) [Wed, 30 Aug 2017 21:36:06 +0000 (21:36 +0000)]
Merge "Merge "IllegalArgumentException in MagnificationGestureHandler" am: 7aff46195e am: f124c72600 am: 99317517cb" into oc-mr1-dev-plus-aosp

7 years agoMerge "IllegalArgumentException in MagnificationGestureHandler" am: 7aff46195e am...
Edward Savage-Jones [Wed, 30 Aug 2017 21:32:34 +0000 (21:32 +0000)]
Merge "IllegalArgumentException in MagnificationGestureHandler" am: 7aff46195e am: f124c72600
am: 99317517cb

Change-Id: I0a9dbba6c94e4ef9dd36d7a7d43a0c36005f47c7

7 years agoFixes NPE thrown in sort if new targets are added.
Kang Li [Wed, 30 Aug 2017 21:18:11 +0000 (14:18 -0700)]
Fixes NPE thrown in sort if new targets are added.

Test: manually tested it to verify that it works as expected.

Bug: 65035399
Change-Id: Ie99b05c5324f47cbac66687d7301ef62a7c83e55

7 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Wed, 30 Aug 2017 21:30:37 +0000 (21:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 8ae8079ed6  -s ours

Change-Id: I32655854c6d45f0fb0959a55d502c44d5fe37988

7 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Wed, 30 Aug 2017 21:25:10 +0000 (21:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 9b9099ef3b  -s ours

Change-Id: Ia903a6127eee43bd4eac71869207da7634e22db7

7 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Wed, 30 Aug 2017 21:19:16 +0000 (21:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: b997ba1131  -s ours

Change-Id: I372f1f65bc2d9918eb6d04c74d0c792516be484c

7 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Wed, 30 Aug 2017 21:14:03 +0000 (21:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 249c45391e  -s ours

Change-Id: I6181ef920c9baab4fa905b3d8772083e4f0bc650

7 years agoMerge "IllegalArgumentException in MagnificationGestureHandler" am: 7aff46195e
Edward Savage-Jones [Wed, 30 Aug 2017 21:10:58 +0000 (21:10 +0000)]
Merge "IllegalArgumentException in MagnificationGestureHandler" am: 7aff46195e
am: f124c72600

Change-Id: I664ad0b3d09036bb2bbb0f0ce2e56d22ca042e7e

7 years agoFix up bar transitions on low end devices
Jason Monk [Wed, 30 Aug 2017 21:05:24 +0000 (17:05 -0400)]
Fix up bar transitions on low end devices

 - Don't allow dark icons, because the backdrop is always dark.
 - Don't show the view when we aren't showing notification icons or
   system info, because the view may need to be transparent.

Test: manual
Change-Id: I5572a6379ceb605b21a1982db00fdf1659593b8a
Fixes: 62549040

7 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Wed, 30 Aug 2017 21:05:22 +0000 (21:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: f5bc976699  -s ours

Change-Id: I57c8b921cf49a36adab1bc7b234427c02f1c3337

7 years agoWebView: fix setSafeBrowsingWhitelist table in docs
Nate Fischer [Tue, 29 Aug 2017 23:17:22 +0000 (16:17 -0700)]
WebView: fix setSafeBrowsingWhitelist table in docs

No change to logic, only docs changes.

The documentation for setSafeBrowsingWhitelist uses a table to describe
whitelist rules. However, this table was previously formatted
incorrectly (it uses <th> elements for each cell, when normal data cells
should use <td> according to Android API guidelines).

This fixes the table to conform to the guidelines, adjusts white space
for consistency, and removes an unnecessary <p> element.

Bug: 65173825
Test: make docs (and manually verify the table looks correct)
Change-Id: I5d7390a44613aaa3acb147a69f8e0ce741e817ed

7 years agoMerge "IllegalArgumentException in MagnificationGestureHandler"
Edward Savage-Jones [Wed, 30 Aug 2017 20:57:27 +0000 (20:57 +0000)]
Merge "IllegalArgumentException in MagnificationGestureHandler"
am: 7aff46195e

Change-Id: I3822533c2d7d01c7d804cfd6ad914d36f5ef482f

7 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Wed, 30 Aug 2017 20:56:39 +0000 (20:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 2ec3964ba4  -s ours

Change-Id: I9ca5dad4cd98b4d04d98858575e9f486be245e1f

7 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:52:19 +0000 (20:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Wed, 30 Aug 2017 20:48:07 +0000 (20:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 26f4e4dfca  -s ours

Change-Id: Ia8bef787b37b25450ad7ee694a11944685ece713

7 years agoMerge "Make slight API and doc adjustments" into oc-mr1-dev
Hall Liu [Wed, 30 Aug 2017 20:41:53 +0000 (20:41 +0000)]
Merge "Make slight API and doc adjustments" into oc-mr1-dev

7 years agoMerge "IllegalArgumentException in MagnificationGestureHandler"
Treehugger Robot [Wed, 30 Aug 2017 20:40:54 +0000 (20:40 +0000)]
Merge "IllegalArgumentException in MagnificationGestureHandler"

7 years agoATV a11y shortcut (CL 1 of 3): Update key chord
Zhen Sun [Thu, 17 Aug 2017 22:56:20 +0000 (15:56 -0700)]
ATV a11y shortcut (CL 1 of 3): Update key chord

Changed accessibility shortcut key chord from [HOME + DPAD_CENTER] to
[BACK + DPAD_DOWN]. (Followed logic in ag/1939791.)
Specified AudioAttributes of TV dialog ringtone to
USAGE_ASSISTANCE_ACCESSIBILITY since this dialog is meant to show up for
accessibility shortcut feature and that will also enable Android TVs to
play ringtone for the warning dialog.

Bug: 64346294
Test: Manually use key chord to trigger accessibility shortcut.
Change-Id: Iacb29400079551a3c3ded6f8391b7541bc1c9f29

7 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:35:52 +0000 (20:35 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:31:03 +0000 (20:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:29:57 +0000 (20:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:28:10 +0000 (20:28 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:24:40 +0000 (20:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:23:09 +0000 (20:23 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Wed, 30 Aug 2017 20:18:07 +0000 (20:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 1dab2308cd  -s ours

Change-Id: Ie93b8ab0d1d64cea8f2fcc03171e688788bd0bb0

7 years agoDon't touch auto dim on app change
Jason Monk [Wed, 30 Aug 2017 20:17:19 +0000 (16:17 -0400)]
Don't touch auto dim on app change

Test: manual
Bug: 63630024
Change-Id: I134aa2695bad36606588ca3e52685826f25ea306

7 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:11:03 +0000 (20:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:04:56 +0000 (20:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

7 years agoMerge "Adding back recents grow in split screen" into oc-mr1-dev
Matthew Ng [Wed, 30 Aug 2017 20:01:55 +0000 (20:01 +0000)]
Merge "Adding back recents grow in split screen" into oc-mr1-dev
am: 45e7a4242b

Change-Id: I902415bf0648c934e1c5e0988e2d2052eb9df013

7 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Wed, 30 Aug 2017 19:50:09 +0000 (19:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 7604fe28e8  -s ours

Change-Id: I570d19568b3dcb3bc0c8da42232f1de18a197972

7 years agoMerge "Adding back recents grow in split screen" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 19:34:24 +0000 (19:34 +0000)]
Merge "Adding back recents grow in split screen" into oc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Wed, 30 Aug 2017 19:32:58 +0000 (19:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

7 years agoUpdate night display intensity coefficients
Christine Franks [Thu, 27 Jul 2017 00:51:16 +0000 (17:51 -0700)]
Update night display intensity coefficients

Bug: 64019890
Test: manual - adjust intensity slider
Change-Id: I38ec7385b36367e5c9f6c606e65a982efbd32a1b

7 years agoMerge "Augment network stats based on SubscriptionPlan." into oc-mr1-dev
Jeff Sharkey [Wed, 30 Aug 2017 19:14:21 +0000 (19:14 +0000)]
Merge "Augment network stats based on SubscriptionPlan." into oc-mr1-dev
am: f31cf45e82

Change-Id: Ia6c6d5893d841f21d181363dc01f77efa6579a8f

7 years agoMerge "Augment network stats based on SubscriptionPlan." into oc-mr1-dev
Jeff Sharkey [Wed, 30 Aug 2017 19:01:18 +0000 (19:01 +0000)]
Merge "Augment network stats based on SubscriptionPlan." into oc-mr1-dev

7 years agoMerge "Setting a wallpaper must be synchronous" into oc-mr1-dev
Chris Tate [Wed, 30 Aug 2017 18:54:19 +0000 (18:54 +0000)]
Merge "Setting a wallpaper must be synchronous" into oc-mr1-dev
am: b00a8aa688

Change-Id: I71cc12349dd80bbb8b0a6776c3e8846baa3dd501

7 years agoMerge "Adds ERROR state to ImsConfig" into oc-mr1-dev
Brad Ebinger [Wed, 30 Aug 2017 18:48:34 +0000 (18:48 +0000)]
Merge "Adds ERROR state to ImsConfig" into oc-mr1-dev
am: ed6e29f292

Change-Id: Id412c0be939da6240a66a942730fd18badabb6c6

7 years agoMerge "Setting a wallpaper must be synchronous" into oc-mr1-dev
Chris Tate [Wed, 30 Aug 2017 18:44:03 +0000 (18:44 +0000)]
Merge "Setting a wallpaper must be synchronous" into oc-mr1-dev

7 years agoAdd heif format to ExifInterface
Chong Zhang [Fri, 25 Aug 2017 23:20:01 +0000 (16:20 -0700)]
Add heif format to ExifInterface

Get heif dimension and rotation from MediaMetadataRetriever.

Bug: 64077740
Change-Id: I711ac70d356dbfd9128a30ab33c0dfd81a4ae17e

7 years agoMerge "Adds ERROR state to ImsConfig" into oc-mr1-dev
Brad Ebinger [Wed, 30 Aug 2017 18:31:43 +0000 (18:31 +0000)]
Merge "Adds ERROR state to ImsConfig" into oc-mr1-dev

7 years agoMerge "Add a constant to allow system-provided fingerprint dialogs" into oc-mr1-dev
Jim Miller [Wed, 30 Aug 2017 18:04:57 +0000 (18:04 +0000)]
Merge "Add a constant to allow system-provided fingerprint dialogs" into oc-mr1-dev
am: fb8e9b9096

Change-Id: I2ce2160b4ffa4f088321710a33475debfd7b1212

7 years agoMerge "Add a constant to allow system-provided fingerprint dialogs" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 17:47:46 +0000 (17:47 +0000)]
Merge "Add a constant to allow system-provided fingerprint dialogs" into oc-mr1-dev

7 years agoBatteryStats: Don't schedule work when shutting down
Adam Lesinski [Wed, 30 Aug 2017 02:30:31 +0000 (19:30 -0700)]
BatteryStats: Don't schedule work when shutting down

Prevent more work from being queued when BatteryStats is
shutting down.

Bug: 64901294
Test: manual
Change-Id: Ifc74a4405b40c949e440d6d65fdd13ec40920429

7 years agoAdding USB audio-class 2.0 spec descriptors.
Paul McLean [Fri, 7 Jul 2017 14:14:52 +0000 (08:14 -0600)]
Adding USB audio-class 2.0 spec descriptors.

Added USB audio-class 2.0 format type descriptors.
Added Tree parsing.
Rearchitected reporting (again) to better support reuse and scale.

Bug: 64301464

Test: Run code against representative USB audio peripherals and verify
that each correctly handles or ignores all descriptors and the correct
device semantics (headset / not-headset) are still calculated.

Change-Id: I1b3b01ab1cd804ed876bf6427c3afba15eea6a6e

7 years agoAugment network stats based on SubscriptionPlan.
Jeff Sharkey [Tue, 29 Aug 2017 21:32:13 +0000 (15:32 -0600)]
Augment network stats based on SubscriptionPlan.

When a carrier provides an "anchor" of data usage at a specific
moment in time, augment the network statistics used by warning/limit
thresholds and Settings UI.  For example, if the OS measured 500MB
of usage, but the carrier says only 400MB has been used, we "squish"
down the OS measured usage to match that anchor.

Callers using the hidden API will have their data augmented by
default, and the public API offers a way to opt-into augmentation.

Thorough testing to verify behavior.

Test: bit FrameworksNetTests:android.net.,com.android.server.net.
Test: cts-tradefed run commandAndExit cts-dev -m CtsUsageStatsTestCases -t android.app.usage.cts.NetworkUsageStatsTest
Bug: 64534190
Change-Id: Id3d4d7625bbf04f57643e51dbf376e3fa0ea8eca

7 years agoMerge "Set CPU Abis for updated system packages" into oc-mr1-dev
Todd Kennedy [Wed, 30 Aug 2017 14:00:31 +0000 (14:00 +0000)]
Merge "Set CPU Abis for updated system packages" into oc-mr1-dev
am: f4a484064b

Change-Id: Ief00d5cd83017aa1e48786660e5b94b0f73f4af0

7 years agoMerge "Set CPU Abis for updated system packages" into oc-mr1-dev
Todd Kennedy [Wed, 30 Aug 2017 13:48:28 +0000 (13:48 +0000)]
Merge "Set CPU Abis for updated system packages" into oc-mr1-dev

7 years agoIntroduce SmartSelectionEventTracker.
Abodunrinwa Toki [Tue, 15 Aug 2017 14:05:11 +0000 (15:05 +0100)]
Introduce SmartSelectionEventTracker.

This will be used for logging text selection interaction.

Bug: 64914512
Test: No test. Everything builds fine.
Change-Id: Idb28864e0fc969be05d81855b2e7cd8389bd835e

7 years agoShutdown more reliably
Erik Kline [Wed, 30 Aug 2017 06:37:20 +0000 (15:37 +0900)]
Shutdown more reliably

Also: collapse largely unused VDBG/DBG into just DBG.

Test: as follows
    - built
    - flashed
    - booted
    - runtest framworks-net passes
Bug: 64914645
Change-Id: Ifbb6b1ce18c52c9cb58c89b9661248a155f7b4a8

7 years agoMerge "Update comment for ASSIST_GESTURE_TRIGGERED" into oc-mr1-dev
Kevin Chyn [Wed, 30 Aug 2017 04:13:03 +0000 (04:13 +0000)]
Merge "Update comment for ASSIST_GESTURE_TRIGGERED" into oc-mr1-dev
am: 102e9e7858

Change-Id: I66a39771ca5d7d1f2648a21a7d4ae484c75c3219

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 30 Aug 2017 04:00:33 +0000 (21:00 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ied35c473af7c2834bc145269270d41c1fbb7563e

7 years agoMerge "Update comment for ASSIST_GESTURE_TRIGGERED" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 03:54:06 +0000 (03:54 +0000)]
Merge "Update comment for ASSIST_GESTURE_TRIGGERED" into oc-mr1-dev