OSDN Git Service
Jason Monk [Thu, 31 Aug 2017 16:48:04 +0000 (16:48 +0000)]
Merge "Don't auto-expand QS from detail panels" into oc-mr1-dev
am:
8b2d853bee
Change-Id: I0f743a26a38b999ed50df67cf12c4d855475b297
Jason Monk [Thu, 31 Aug 2017 16:41:34 +0000 (16:41 +0000)]
Merge "Fix carrier text rtl alignment" into oc-mr1-dev
am:
7578b3db2c
Change-Id: I9af801b1e6665c690d6df72313bb9b0a71064946
Jason Monk [Thu, 31 Aug 2017 16:31:26 +0000 (16:31 +0000)]
Merge "Don't auto-expand QS from detail panels" into oc-mr1-dev
Jason Monk [Thu, 31 Aug 2017 16:31:10 +0000 (16:31 +0000)]
Merge "Fix carrier text rtl alignment" into oc-mr1-dev
Jason Monk [Thu, 31 Aug 2017 15:53:18 +0000 (15:53 +0000)]
Merge "Fix multi user battery percentage" into oc-mr1-dev
am:
e603a67a62
Change-Id: Idb21e3af999e42d90e0f6fd453b13183bcdd8489
Pavel Grafov [Thu, 31 Aug 2017 15:48:18 +0000 (15:48 +0000)]
Merge "Unlock managed profile keystore when user is unlocked." into oc-mr1-dev
am:
060b87b068
Change-Id: Ib9b53f97f09dc31563ea53d760067027ac2dde67
Android Build Merger (Role) [Thu, 31 Aug 2017 15:42:40 +0000 (15:42 +0000)]
Merge "Merge "Fix tuner DND UI" into oc-mr1-dev am:
5285e053b3" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 31 Aug 2017 15:39:42 +0000 (15:39 +0000)]
Merge "Merge changes I49057737,I68e3096d am:
50cf621704 am:
f5dcc28b0c am:
30348a8abb" into oc-mr1-dev-plus-aosp
Jason Monk [Thu, 31 Aug 2017 15:39:42 +0000 (15:39 +0000)]
Merge "Fix tuner DND UI" into oc-mr1-dev
am:
5285e053b3
Change-Id: Ic82ecc1588f79d49a78df63998633464c3f6dabc
TreeHugger Robot [Thu, 31 Aug 2017 15:38:57 +0000 (15:38 +0000)]
Merge "Fix multi user battery percentage" into oc-mr1-dev
Andreas Gampe [Thu, 31 Aug 2017 15:35:58 +0000 (15:35 +0000)]
Merge changes I49057737,I68e3096d am:
50cf621704 am:
f5dcc28b0c
am:
30348a8abb
Change-Id: I9755772ab8c8d4c3708ee2a65cda0b0d3f39d30e
TreeHugger Robot [Thu, 31 Aug 2017 15:33:54 +0000 (15:33 +0000)]
Merge "Unlock managed profile keystore when user is unlocked." into oc-mr1-dev
Yohei Yukawa [Thu, 31 Aug 2017 15:32:59 +0000 (15:32 +0000)]
Merge "Fix wrong dump output of *Info#flags" into oc-mr1-dev
am:
c4a8b3625b
Change-Id: I43645394470ca01bd533da378ba9edc3abaa3a3b
TreeHugger Robot [Thu, 31 Aug 2017 15:28:56 +0000 (15:28 +0000)]
Merge "Fix tuner DND UI" into oc-mr1-dev
Andreas Gampe [Thu, 31 Aug 2017 15:27:52 +0000 (15:27 +0000)]
Merge changes I49057737,I68e3096d am:
50cf621704
am:
f5dcc28b0c
Change-Id: Id25418e3def0b63a8c52671546968017cf350d18
Yohei Yukawa [Thu, 31 Aug 2017 15:26:07 +0000 (15:26 +0000)]
Merge "Fix wrong dump output of *Info#flags" into oc-mr1-dev
Yohei Yukawa [Thu, 31 Aug 2017 07:26:01 +0000 (00:26 -0700)]
Fix wrong dump output of *Info#flags
This CL follows up to a previous CL [1] that introduced an ability to
control filtering level of
- ActivityInfo#dump()
- ApplicationInfo#dump()
- ComponentInfo#dump()
- ProviderInfo#dump()
- ResolveInfo#dump()
- ServiceInfo#dump()
but also masked following outputs as an unexpected side effect.
- ActivityInfo#flags
- ApplicationInfo#flags
- ProviderInfo#flags
- ServiceInfo#flags
With this CL, above *Info#flags are correctly dumped again.
[1]: I0d01565babb87e68b840c9756a2ea730d699efc7
6ac42aeed905181b484f97a53db57a17134ef7a8
Test: Manually tested as follows.
1. make -j SoftKeyboard
2. adb install -r $OUT/system/app/SoftKeyboard/SoftKeyboard.apk
3. adb shell dumpsys input_method
-> Check 'com.example.android.softkeyboard' section
-> make sure ServiceInfo#flags=0x0
-> make sure ApplicationInfo#flags=0x38a8be44
FLAG_HAS_CODE (1<<2)
FLAG_ALLOW_CLEAR_USER_DATA (1<<6)
FLAG_SUPPORTS_SMALL_SCREENS (1<<9)
FLAG_SUPPORTS_NORMAL_SCREENS (1<<10)
FLAG_SUPPORTS_LARGE_SCREENS (1<<11)
FLAG_RESIZEABLE_FOR_SCREENS (1<<12)
FLAG_SUPPORTS_SCREEN_DENSITIES (1<<13)
FLAG_ALLOW_BACKUP (1<<15)
FLAG_SUPPORTS_XLARGE_SCREENS (1<<19)
FLAG_STOPPED (1<<21)
FLAG_SUPPORTS_RTL (1<<22)
FLAG_INSTALLED (1<<23)
FLAG_FULL_BACKUP_ONLY (1<<26)
FLAG_EXTRACT_NATIVE_LIBS (1<<28)
FLAG_HARDWARE_ACCELERATED (1<<29)
Fixes:
65057767
Change-Id: Icd1e18237e873844791ccdea7f424b6fe76137c0
Tyler Gunn [Thu, 31 Aug 2017 15:22:44 +0000 (15:22 +0000)]
Merge "De-couple data enabled from VT settings." into oc-mr1-dev
am:
e0f1f26d87
Change-Id: I424cd828a7616c2947367bdb4a82a62cf17847e7
Andreas Gampe [Thu, 31 Aug 2017 15:15:31 +0000 (15:15 +0000)]
Merge changes I49057737,I68e3096d
am:
50cf621704
Change-Id: Id66d91bc326461dc3cae4cbae03f3d060761ea7f
Tyler Gunn [Thu, 31 Aug 2017 15:13:08 +0000 (15:13 +0000)]
Merge "De-couple data enabled from VT settings." into oc-mr1-dev
Android Build Merger (Role) [Thu, 31 Aug 2017 15:02:30 +0000 (15:02 +0000)]
Merge "Merge "Revert "Nat464Xlat: interface notification handler on ConnectivityService"" am:
1d66352b40 am:
4c1b0ae343 am:
de68a0a1af" into oc-mr1-dev-plus-aosp
Treehugger Robot [Thu, 31 Aug 2017 15:01:37 +0000 (15:01 +0000)]
Merge changes I49057737,I68e3096d
* changes:
Frameworks: Clean up SystemProperties
Frameworks: Add warning to SystemProperties.get
Hugo Benichi [Thu, 31 Aug 2017 14:58:48 +0000 (14:58 +0000)]
Merge "Revert "Nat464Xlat: interface notification handler on ConnectivityService"" am:
1d66352b40 am:
4c1b0ae343
am:
de68a0a1af
Change-Id: Icff7a1fa8888654914fceaf324219ed6af3c95ed
Bryce Lee [Thu, 31 Aug 2017 14:54:15 +0000 (14:54 +0000)]
Merge "Clear pending activity options when retrieved in ActivityManagerService." into oc-mr1-dev
am:
7e0e6e904c
Change-Id: I4d8c8ee58d8d1618ea39342dca0434e6a286fc1b
Hugo Benichi [Thu, 31 Aug 2017 14:48:46 +0000 (14:48 +0000)]
Merge "Revert "Nat464Xlat: interface notification handler on ConnectivityService"" am:
1d66352b40
am:
4c1b0ae343
Change-Id: Ibb3a382ad45a708c63a3d7f4d3be0bf54881403a
Bryce Lee [Thu, 31 Aug 2017 14:43:02 +0000 (14:43 +0000)]
Merge "Clear pending activity options when retrieved in ActivityManagerService." into oc-mr1-dev
Hugo Benichi [Thu, 31 Aug 2017 14:39:18 +0000 (14:39 +0000)]
Merge "Revert "Nat464Xlat: interface notification handler on ConnectivityService""
am:
1d66352b40
Change-Id: I691095ce56e30e2fada93bc5500453f13ac51403
Hugo Benichi [Thu, 31 Aug 2017 14:31:24 +0000 (14:31 +0000)]
Merge "Revert "Nat464Xlat: interface notification handler on ConnectivityService""
Hugo Benichi [Thu, 31 Aug 2017 14:29:51 +0000 (14:29 +0000)]
Revert "Nat464Xlat: interface notification handler on ConnectivityService"
This reverts commit
771d5c2f0126ba692897c9716f4098ae6e3a870c due to b/
65225023.
Change-Id: I6ca3780afb8d47b77219d6b5a06760042f684c4b
Android Build Merger (Role) [Thu, 31 Aug 2017 13:15:54 +0000 (13:15 +0000)]
Merge "Update UnlockMethodCache when screen turns off am:
08ae664365 am:
0550bddc95" into oc-mr1-dev-plus-aosp
Kevin Chyn [Thu, 31 Aug 2017 13:11:34 +0000 (13:11 +0000)]
Update UnlockMethodCache when screen turns off am:
08ae664365
am:
83d0cd221f
Change-Id: I227539fdebcdebdaf8494c5ae2028752c0fb53f6
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
Kevin Chyn [Thu, 31 Aug 2017 12:59:00 +0000 (12:59 +0000)]
Update UnlockMethodCache when screen turns off
am:
08ae664365
Change-Id: I416497c2ffeca295b9620a6d1d6f9868935dd25a
Kevin Chyn [Thu, 31 Aug 2017 12:59:00 +0000 (12:59 +0000)]
Update UnlockMethodCache when screen turns off
am:
08ae664365
Change-Id: I132358dc66f04cb2531e6d57ed8d2dd14947b62d
Pavel Grafov [Wed, 23 Aug 2017 11:20:54 +0000 (12:20 +0100)]
Unlock managed profile keystore when user is unlocked.
With file based encryption when the user unlock the phone,
managed profile is already running (in a locked state). But
on full disk encryption devices, LSS attempts to unlock child
profile straight after unlocking user 0, which fails because
the profile is not yet running.
With this change once the profile gets unlocked (happens after
ActivityManagerService processes START_PROFILES_MSG message)
LSS will attempt to unlock its keystore.
Bug:
64722589
Test: manual, tried FDE and FBE devices with unified challenge.
Change-Id: Ic614cc3c6732a3db6aaf56fef1822e358d742510
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
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
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
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
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
Erik Kline [Thu, 31 Aug 2017 03:45:23 +0000 (03:45 +0000)]
Merge "Shutdown more reliably" am:
549c3d2e4f
am:
7e5b415861
Change-Id: Id2bd17e649d28cc484292e1f1ec5644c014bc395
Erik Kline [Thu, 31 Aug 2017 03:30:55 +0000 (03:30 +0000)]
Merge "Shutdown more reliably"
am:
549c3d2e4f
Change-Id: I9ff7e6ee49bb88f9a63b269d57d5e91ed6ddec31
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
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
TreeHugger Robot [Thu, 31 Aug 2017 03:12:24 +0000 (03:12 +0000)]
Merge "Update icons to have rounded corner" into oc-mr1-dev
Treehugger Robot [Thu, 31 Aug 2017 03:11:51 +0000 (03:11 +0000)]
Merge "Shutdown more reliably"
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
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
TreeHugger Robot [Thu, 31 Aug 2017 02:28:11 +0000 (02:28 +0000)]
Merge "WebView: fix setSafeBrowsingWhitelist table in docs" into oc-mr1-dev
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
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
Andreas Gampe [Sat, 29 Jul 2017 21:14:39 +0000 (14:14 -0700)]
Frameworks: Clean up SystemProperties
Clean up SystemProperties.java. Add annotations.
Clean up SystemProperties.cpp. Refactor for proper C++11.
Make sure C-string key construction is properly reused. Use
android::base functionality for actual reading.
Fix the test script to refer to the right location. Add some
test coverage.
(cherry picked from commit
2e6b9cb56320a86f0c33da890f667e5c76c8285d)
Test: m
Test: frameworks/base/core/tests/systemproperties/run_core_systemproperties_test.sh --rebuild
Merged-In: I490577370da985f600fb1117e3c818d3f68bad5f
Change-Id: I490577370da985f600fb1117e3c818d3f68bad5f
Andreas Gampe [Sat, 29 Jul 2017 01:20:37 +0000 (18:20 -0700)]
Frameworks: Add warning to SystemProperties.get
Add a warning that calling get() is unsafe when the system property
may not contain a valid UTF-encoded string.
(cherry picked from commit
6bf1cff1dd8cad0d2c6eb4f2cef28a97270e46b2)
Bug:
63177684
Test: m
Merged-In: I68e3096d770a32fe204be5c130a3ada9d3db7c0b
Change-Id: I68e3096d770a32fe204be5c130a3ada9d3db7c0b
TreeHugger Robot [Thu, 31 Aug 2017 01:23:03 +0000 (01:23 +0000)]
Merge "Adjusting PiP for the TV IME." 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
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
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
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot [Wed, 30 Aug 2017 23:35:07 +0000 (23:35 +0000)]
Merge "Add static lock in PowerProfile" into oc-mr1-dev
Jason Monk [Wed, 30 Aug 2017 23:18:00 +0000 (19:18 -0400)]
Fix multi user battery percentage
Test: Use battery percentage with multi user, like at all
Change-Id: Ie59d2409e79469138c04450528ed3e9f4e1c06aa
Fixes:
64442190
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
Jason Monk [Wed, 30 Aug 2017 23:09:01 +0000 (19:09 -0400)]
Fix tuner DND UI
Test: visual
Change-Id: Ia90209b487aeee4ee162c54aa6cf923551f50d31
Fixes:
62588404
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
TreeHugger Robot [Wed, 30 Aug 2017 23:05:12 +0000 (23:05 +0000)]
Merge "Add heif format to ExifInterface" 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
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
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
Jason Monk [Wed, 30 Aug 2017 22:47:09 +0000 (18:47 -0400)]
Don't auto-expand QS from detail panels
We don't have tiles that launch detail panels from collapsed state
anymore, and its getting in the way of animateExpandSettingsPanel.
Test: visual
Change-Id: I9e8049f775a7ed7a9fe1aac035a7527a997707bc
Fixes:
62912307
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
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
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
Christine Franks [Wed, 30 Aug 2017 22:33:01 +0000 (22:33 +0000)]
Merge "Update night display intensity coefficients" into oc-mr1-dev
Jason Monk [Wed, 30 Aug 2017 22:27:50 +0000 (18:27 -0400)]
Fix carrier text rtl alignment
Test: visual
Change-Id: I91f76bdbe23cfd2ee0df023a970f73428bd513e9
Fixes:
62622048
TreeHugger Robot [Wed, 30 Aug 2017 22:13:58 +0000 (22:13 +0000)]
Merge "Introduce SmartSelectionEventTracker." 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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Edward Savage-Jones [Wed, 30 Aug 2017 20:57:27 +0000 (20:57 +0000)]
Merge "IllegalArgumentException in MagnificationGestureHandler"
am:
7aff46195e
Change-Id: I3822533c2d7d01c7d804cfd6ad914d36f5ef482f
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
OSDN Git Service
