OSDN Git Service
Android Build Merger (Role) [Thu, 24 Aug 2017 16:29:02 +0000 (16:29 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
7175b7b929 -s ours am:
f8376b0642 -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Thu, 24 Aug 2017 16:24:56 +0000 (16:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
7175b7b929 -s ours
am:
f8376b0642 -s ours
Change-Id: I6120226cd003e9fdabfe68b2eb321752cb565abd
Chris Thornton [Thu, 24 Aug 2017 16:20:08 +0000 (16:20 +0000)]
Merge "The VIS should return an AOHD regardless of keyphrase availability." into oc-mr1-dev
am:
0a14929b77
Change-Id: I01f692007628850151e023a9dd8fdb9d9451527a
Bill Yi [Thu, 24 Aug 2017 16:11:23 +0000 (16:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
7175b7b929 -s ours
Change-Id: I45956469aa428467ffb7039288cd99a177566083
TreeHugger Robot [Thu, 24 Aug 2017 16:08:21 +0000 (16:08 +0000)]
Merge "The VIS should return an AOHD regardless of keyphrase availability." into oc-mr1-dev
Selim Cinek [Thu, 24 Aug 2017 16:07:37 +0000 (16:07 +0000)]
Merge "Fixed an issue where isFalseTouch could be queried" into oc-mr1-dev
am:
efeb2cf943
Change-Id: I3e46e13d5e84a5e45849ca15d716486f1032bc4f
TreeHugger Robot [Thu, 24 Aug 2017 16:01:06 +0000 (16:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Selim Cinek [Thu, 24 Aug 2017 16:00:20 +0000 (16:00 +0000)]
Merge "Fixed an issue where isFalseTouch could be queried" into oc-mr1-dev
Tyler Gunn [Thu, 24 Aug 2017 15:06:22 +0000 (15:06 +0000)]
Merge "Add new telephony disconnect causes for low battery scenario." into oc-mr1-dev
am:
ac3c798ab5
Change-Id: I80a22e7fdb0272313c8d9f98b6360c6d235e37ac
Tyler Gunn [Thu, 24 Aug 2017 15:01:52 +0000 (15:01 +0000)]
Merge "Add new telephony disconnect causes for low battery scenario." into oc-mr1-dev
Jack He [Thu, 24 Aug 2017 13:35:19 +0000 (13:35 +0000)]
Merge "Bluetooth: Add flag for human readable name" into oc-mr1-dev
am:
34eac2c59b
Change-Id: I9ccc78cf03a37f80d3ba10408050a0b847bc2c7a
TreeHugger Robot [Thu, 24 Aug 2017 13:29:28 +0000 (13:29 +0000)]
Merge "Bluetooth: Add flag for human readable name" into oc-mr1-dev
Jorim Jaggi [Thu, 24 Aug 2017 13:26:16 +0000 (13:26 +0000)]
Merge "Sleep activities with AOD" into oc-mr1-dev
am:
f1ef6ef742
Change-Id: Id4bcfa48e8cd32449c82e5b501357a6315329e11
Jorim Jaggi [Thu, 24 Aug 2017 13:19:42 +0000 (13:19 +0000)]
Merge "Sleep activities with AOD" into oc-mr1-dev
Narayan Kamath [Thu, 24 Aug 2017 11:27:31 +0000 (11:27 +0000)]
Merge "sounds : Add a makefile for Android Go specific sounds." into oc-mr1-dev
am:
0d9c30cf88
Change-Id: Ib8e91584604ab4abf46c53b35aa2b6be70a23f8a
Bill Yi [Thu, 24 Aug 2017 11:18:53 +0000 (04:18 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ied6de9cbe69d8c72f9ba8c0095451a175f02d4dd
TreeHugger Robot [Thu, 24 Aug 2017 11:18:31 +0000 (11:18 +0000)]
Merge "sounds : Add a makefile for Android Go specific sounds." into oc-mr1-dev
Lorenzo Colitti [Thu, 24 Aug 2017 11:03:38 +0000 (11:03 +0000)]
Merge "Trivial change to test expectations." into oc-mr1-dev
am:
9487f80cc5
Change-Id: Iad2aad7163aea9b1b92ed3f46be7ce36cd0578c6
TreeHugger Robot [Thu, 24 Aug 2017 10:55:20 +0000 (10:55 +0000)]
Merge "Trivial change to test expectations." into oc-mr1-dev
Alexandru-Andrei Rotaru [Thu, 24 Aug 2017 10:17:37 +0000 (10:17 +0000)]
Merge "StringParceledListSlice throws exception when the IPC memory threshold is exceeded" into oc-mr1-dev
am:
afe28cdf7e
Change-Id: Id6236ee2229b1a03fbddb5b408fb956f8e6ece09
TreeHugger Robot [Thu, 24 Aug 2017 10:08:15 +0000 (10:08 +0000)]
Merge "StringParceledListSlice throws exception when the IPC memory threshold is exceeded" into oc-mr1-dev
Jack He [Mon, 24 Jul 2017 21:55:59 +0000 (14:55 -0700)]
Bluetooth: Add flag for human readable name
* Add hasHumanReadableName() method to CachedBluetoothDevice that
returns True when BluetoothDevice.getAliasName() is not null nor empty
Bug:
34685932
Test: pair Bluetooth device, send file over Bluetooth, unit tests
Change-Id: I197f3f7f3bcb7d785729473b25638006449ae862
Jack He [Thu, 24 Aug 2017 08:45:07 +0000 (08:45 +0000)]
Merge "CachedBluetoothDevice: Rename mVisible to mJustDiscovered" into oc-mr1-dev
am:
cb065bc33e
Change-Id: I089e0f69629666d21bc401c2191341a71d7c3172
TreeHugger Robot [Thu, 24 Aug 2017 08:34:39 +0000 (08:34 +0000)]
Merge "CachedBluetoothDevice: Rename mVisible to mJustDiscovered" into oc-mr1-dev
Bill Yi [Thu, 24 Aug 2017 08:10:53 +0000 (08:10 +0000)]
Import translations. DO NOT MERGE am:
b4f16b10af -s ours
am:
767ca11384 -s ours
Change-Id: I6a46c18871f77a0f97c2498dc1595bd29e1e6575
Android Build Merger (Role) [Thu, 24 Aug 2017 08:07:04 +0000 (08:07 +0000)]
Merge "Import translations. DO NOT MERGE am:
b4f16b10af -s ours am:
e7527d1334 -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Thu, 24 Aug 2017 08:03:28 +0000 (08:03 +0000)]
Import translations. DO NOT MERGE am:
b4f16b10af -s ours
am:
e7527d1334 -s ours
Change-Id: Id460576d6660c50202833d7eab6152c45213951a
Bill Yi [Thu, 24 Aug 2017 07:58:50 +0000 (07:58 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
0309d32f3e -s ours
Change-Id: I3982df3278279f1debb6b2e578393edbc37b356a
Bill Yi [Thu, 24 Aug 2017 07:54:49 +0000 (07:54 +0000)]
Import translations. DO NOT MERGE
am:
b4f16b10af -s ours
Change-Id: I458f0c75e3df2dccd9d622b4444c629ff7020f81
TreeHugger Robot [Thu, 24 Aug 2017 07:51:36 +0000 (07:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Thu, 24 Aug 2017 07:50:24 +0000 (07:50 +0000)]
Import translations. DO NOT MERGE
am:
b4f16b10af -s ours
Change-Id: I0b3cf2e8204f78f342754b06988bd63344e72fa7
Erik Kline [Thu, 24 Aug 2017 05:56:56 +0000 (05:56 +0000)]
Merge changes from topic "offload_cherrypick" am:
b09cf3fbf1 am:
df2a880775
am:
64f6edc7fa -s ours
Change-Id: I604ec95dec7466831a29526217308bb869326229
Erik Kline [Thu, 24 Aug 2017 05:44:58 +0000 (05:44 +0000)]
Merge changes from topic "offload_cherrypick" am:
b09cf3fbf1
am:
df2a880775
Change-Id: I3db23fef19fc66a4eee158fb3367f45078b30872
Erik Kline [Thu, 24 Aug 2017 05:33:44 +0000 (05:33 +0000)]
Merge changes from topic "offload_cherrypick"
am:
b09cf3fbf1
Change-Id: Icb4332b34bc8b940a2c30beab143f7136e0178de
Treehugger Robot [Thu, 24 Aug 2017 05:18:23 +0000 (05:18 +0000)]
Merge changes from topic "offload_cherrypick"
* changes:
Send add/removeDownstream info to offload HAL
Don't completely stop offload if setting data limit fails.
Winson Chung [Thu, 24 Aug 2017 05:12:43 +0000 (05:12 +0000)]
Merge "Move PiP state check exception to the client side" into oc-mr1-dev
am:
3a02835a02
Change-Id: I628c81e32efecf733c6deb73f2877b00f66fa68c
Sundeep Ghuman [Thu, 24 Aug 2017 05:01:23 +0000 (05:01 +0000)]
Merge "Implement score cache eviction in AccessPoint." into oc-mr1-dev
am:
f563cc5a5a
Change-Id: I2fb9fd06d77023c814d3dedc4ca4cc653ae4cd01
TreeHugger Robot [Thu, 24 Aug 2017 05:00:48 +0000 (05:00 +0000)]
Merge "Move PiP state check exception to the client side" into oc-mr1-dev
TreeHugger Robot [Thu, 24 Aug 2017 04:50:47 +0000 (04:50 +0000)]
Merge "Implement score cache eviction in AccessPoint." into oc-mr1-dev
Justin Klaassen [Thu, 24 Aug 2017 04:50:13 +0000 (04:50 +0000)]
Merge "Support l11n of Qualcomm aptX strings" into oc-mr1-dev
am:
b1bd840924
Change-Id: Ibc7eed03b814ae725c9a86bca16be6c3f5c70141
TreeHugger Robot [Thu, 24 Aug 2017 04:41:01 +0000 (04:41 +0000)]
Merge "Support l11n of Qualcomm® aptX™ strings" into oc-mr1-dev
Jack He [Mon, 24 Jul 2017 19:30:08 +0000 (12:30 -0700)]
CachedBluetoothDevice: Rename mVisible to mJustDiscovered
* CachedBluetoothDevice's member mVisible does not mean whether the
device is visible. Instead, based on its current usage in the library,
it indicates whether the device was just discovered by SettingsLib.
* Rename the field to mJustDiscovered and associated setters and
getters.
* This paves way for future addition of mVisible to indicate whether the
device should be visible to user in the UI.
Bug:
34685932
Test: build only, no functional changes
Change-Id: I616904e6d5bb27dbae74f94819eb0e8607a16e20
Hugo Benichi [Thu, 24 Aug 2017 04:09:14 +0000 (04:09 +0000)]
Merge "Make NetworkManagementServiceTest pass again." am:
29b1826ff2 am:
d3d6ddea94
am:
c933ef6c54
Change-Id: Ic39262b1f650695cc6903c3a9e2ddb592d47b365
Hugo Benichi [Thu, 24 Aug 2017 03:57:38 +0000 (03:57 +0000)]
Merge "Make NetworkManagementServiceTest pass again." am:
29b1826ff2
am:
d3d6ddea94
Change-Id: I3bd2e7242a8100590311cca40369adf45b06e52f
Erik Kline [Thu, 6 Jul 2017 10:49:35 +0000 (19:49 +0900)]
Send add/removeDownstream info to offload HAL
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passed
Bug:
29337859
Bug:
32163131
Merged-In: I0cb81ac054fc2bf6c8b8bfe658e9404a15091d7a
Merged-In: I7abcdcc2d7d967179c47081a6db2b417164891f3
Change-Id: I6c59aa7cb80b54f376f294b24c1409710c553d74
(cherry picked from commit
ed962a84122ab950a103fbbc0bf911f61b6b9500)
Lorenzo Colitti [Mon, 21 Aug 2017 03:34:50 +0000 (12:34 +0900)]
Don't completely stop offload if setting data limit fails.
Currently, if setting a data limit fails, we completely stop
offload in order to avoid data overages. However, the next thing
we do is try to fetch the stats and crash, because once offload
is stopped all our local state is cleared.
Fix this by fetching stats before we stop offload.
Bug:
29337859
Bug:
32163131
Bug:
64867836
Test: OffloadControllerTest passes
Test: no crash when disabling wifi tethering with BT tethering active
Merged-In: I7fc47e60b2da5f39c26fb22c1325618f9948dd38
Merged-In: I464dd2a6d1996b1cfb8bbf82b6ee453fd0747569
Change-Id: I260f5450f8b67f055983af68fb23a5f3cfc0bc69
(cherry picked from commit
d743601a002ac12c02da58e92ebd0544ab0b77ea)
Hugo Benichi [Thu, 24 Aug 2017 03:46:07 +0000 (03:46 +0000)]
Merge "Make NetworkManagementServiceTest pass again."
am:
29b1826ff2
Change-Id: If7fafa0922fdbc499c0c911a3f88ede9c8a26c1d
Lorenzo Colitti [Thu, 24 Aug 2017 03:40:07 +0000 (12:40 +0900)]
Trivial change to test expectations.
Bug:
32163131
Test: runtest frameworks-net
Change-Id: Iea41c2b50502797f559afd09ded8cedf50dd7c05
Hugo Benichi [Thu, 24 Aug 2017 03:36:20 +0000 (03:36 +0000)]
Merge "Make NetworkManagementServiceTest pass again."
Winson Chung [Thu, 24 Aug 2017 03:31:11 +0000 (03:31 +0000)]
Merge "Fix issue with resizing background and incorrectly outline." into oc-mr1-dev
am:
270cee0bc2
Change-Id: Id70dab5ec07d17a8e88205c157f25ff352c5bcb6
Winson Chung [Thu, 24 Aug 2017 03:23:43 +0000 (03:23 +0000)]
Merge "Fix issue with resizing background and incorrectly outline." into oc-mr1-dev
Hugo Benichi [Thu, 24 Aug 2017 03:14:47 +0000 (03:14 +0000)]
Merge "Tethering offload stats updates are eventually consistent" am:
ff12ba9376 am:
bbadcfd315
am:
3d2bf1a5e7 -s ours
Change-Id: Ie4353e3dcd3d9be4e8ff0d8f4e6daf96362eadc6
Bill Yi [Thu, 24 Aug 2017 03:13:10 +0000 (20:13 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ifc65484d51405de737a5b269fe6b6036638d0df1
Hugo Benichi [Thu, 24 Aug 2017 03:02:47 +0000 (03:02 +0000)]
Merge "Tethering offload stats updates are eventually consistent" am:
ff12ba9376
am:
bbadcfd315
Change-Id: I3ad83ee73bded3b3987bbc86d776852e6ef20f28
Bill Yi [Thu, 24 Aug 2017 03:01:50 +0000 (20:01 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ia19cd901c16c37d3053afc81aa47cf2dff5bbeea
Hugo Benichi [Thu, 24 Aug 2017 02:52:42 +0000 (02:52 +0000)]
Merge "Tethering offload stats updates are eventually consistent"
am:
ff12ba9376
Change-Id: I3a8ddc928b60c666faab2991defe8fb7afd0801e
Hugo Benichi [Thu, 24 Aug 2017 02:37:03 +0000 (02:37 +0000)]
Merge "Tethering offload stats updates are eventually consistent"
Winson Chung [Thu, 24 Aug 2017 01:48:34 +0000 (01:48 +0000)]
Merge "Fix issue with race when updating/using layout algorithm." into oc-mr1-dev
am:
5c53c6c6f5
Change-Id: I06c3ae928d8008ec5afd04acb4ad439736933606
TreeHugger Robot [Thu, 24 Aug 2017 01:39:10 +0000 (01:39 +0000)]
Merge "Fix issue with race when updating/using layout algorithm." into oc-mr1-dev
Beverly Tai [Thu, 24 Aug 2017 01:34:25 +0000 (01:34 +0000)]
Merge "DND footer doesn't stutter when exiting DND mode." into oc-mr1-dev
am:
a2dbf80a13
Change-Id: I7b9bdcbf16e6b91d87e9c86609d9e1d7d174db44
Erik Kline [Thu, 24 Aug 2017 01:27:46 +0000 (01:27 +0000)]
Merge "Send add/removeDownstream info to offload HAL" into oc-mr1-dev
am:
568cd41216
Change-Id: I0cb81ac054fc2bf6c8b8bfe658e9404a15091d7a
Beverly Tai [Thu, 24 Aug 2017 01:23:33 +0000 (01:23 +0000)]
Merge "DND footer doesn't stutter when exiting DND mode." into oc-mr1-dev
TreeHugger Robot [Thu, 24 Aug 2017 01:09:57 +0000 (01:09 +0000)]
Merge "Send add/removeDownstream info to offload HAL" into oc-mr1-dev
Sundeep Ghuman [Thu, 24 Aug 2017 00:05:26 +0000 (00:05 +0000)]
Merge "Generate fallback speed label in AccessPoint.java" into oc-mr1-dev
am:
53414a98c2
Change-Id: Ifc2540c0d8d4e1fdebdfe5127d36f45b68795ef3
Nate Fischer [Wed, 23 Aug 2017 23:56:56 +0000 (23:56 +0000)]
Merge "WebView: clarify docs for addJavascriptInterface" into oc-mr1-dev
am:
bc99692f02
Change-Id: I515ab33e8a306c4f8c0cd64d0bc3d8269d0c1904
TreeHugger Robot [Wed, 23 Aug 2017 23:43:16 +0000 (23:43 +0000)]
Merge "Generate fallback speed label in AccessPoint.java" into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 23:41:56 +0000 (23:41 +0000)]
Merge "WebView: clarify docs for addJavascriptInterface" into oc-mr1-dev
Felipe Leme [Wed, 23 Aug 2017 23:40:30 +0000 (23:40 +0000)]
Merge "Fixed synchronization when calling cancellation signal." into oc-mr1-dev
am:
102e6631cf
Change-Id: I8ed730d3634ae90559d0b5ca9de49834031af19d
Matthew Ng [Wed, 23 Aug 2017 23:34:03 +0000 (23:34 +0000)]
Merge "Always use low-res tasksnapshots for low ram devices" into oc-mr1-dev
am:
4ce4d954e3
Change-Id: Id3afb3782703221d6f97c290dd9259ecbc91293b
Svetoslav Ganov [Wed, 23 Aug 2017 23:21:18 +0000 (23:21 +0000)]
Merge "Use all certs for computing package signing sha256" into oc-mr1-dev
am:
ee580764ad
Change-Id: Ie766ecd41d2ac07dd3608fa4ed69edc3c575058f
TreeHugger Robot [Wed, 23 Aug 2017 23:15:59 +0000 (23:15 +0000)]
Merge "Fixed synchronization when calling cancellation signal." into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 23:01:53 +0000 (23:01 +0000)]
Merge "Always use low-res tasksnapshots for low ram devices" into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 22:51:41 +0000 (22:51 +0000)]
Merge "Use all certs for computing package signing sha256" into oc-mr1-dev
Android Build Merger (Role) [Wed, 23 Aug 2017 22:45:42 +0000 (22:45 +0000)]
Merge "Merge "Change KernelUidCpuFreqTimeReader Slog.wtf to Slog.e" into oc-mr1-dev am:
29091ec55f" into oc-mr1-dev-plus-aosp
Sudheer Shanka [Wed, 23 Aug 2017 22:38:49 +0000 (22:38 +0000)]
Merge "Change KernelUidCpuFreqTimeReader Slog.wtf to Slog.e" into oc-mr1-dev
am:
29091ec55f
Change-Id: I2540bd98007d8471758dfcbf365cab231594c52c
Hall Liu [Wed, 23 Aug 2017 22:34:22 +0000 (22:34 +0000)]
Merge "Embms adjustments for 7/28" am:
3f6a95e8b0 am:
aeb64f7f98
am:
070508ea7a
Change-Id: I51a886a6d30bc4a13fd25fd5d96819353257b5f5
Sudheer Shanka [Wed, 23 Aug 2017 22:26:08 +0000 (22:26 +0000)]
Merge "Change KernelUidCpuFreqTimeReader Slog.wtf to Slog.e" into oc-mr1-dev
Selim Cinek [Wed, 23 Aug 2017 19:21:23 +0000 (12:21 -0700)]
Fixed an issue where isFalseTouch could be queried
We shouldn't forward any touches if we're not on the
lockscreen.
Test: drag down, turn of the screen
Change-Id: I90acdd7e57322227042b98741721fec977b80f97
Fixes:
63165400
Hall Liu [Wed, 23 Aug 2017 22:22:48 +0000 (22:22 +0000)]
Merge "Embms adjustments for 7/28" am:
3f6a95e8b0
am:
aeb64f7f98
Change-Id: I88b9f6fb07b9e7e10bb375d2e8bef968da51c20c
Sundeep Ghuman [Tue, 15 Aug 2017 22:47:18 +0000 (15:47 -0700)]
Implement score cache eviction in AccessPoint.
This prevents cached scores from being held indefinitely and used for
SSID fallback logic in WifiTracker (Picker).
Bug:
63073866
Test: runtest --path frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Change-Id: Ib351d20db30dfd18b69bb1f8e4d4f26fc6b74ef0
Merged-In: Ib351d20db30dfd18b69bb1f8e4d4f26fc6b74ef0
Erik Kline [Thu, 6 Jul 2017 10:49:35 +0000 (19:49 +0900)]
Send add/removeDownstream info to offload HAL
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passed
Bug:
29337859
Bug:
32163131
Change-Id: I6c59aa7cb80b54f376f294b24c1409710c553d74
Hall Liu [Wed, 23 Aug 2017 22:10:09 +0000 (22:10 +0000)]
Merge "Embms adjustments for 7/28"
am:
3f6a95e8b0
Change-Id: I925a0a894098071a3d092d953e4d545a58531a69
Winson Chung [Thu, 10 Aug 2017 22:57:18 +0000 (15:57 -0700)]
Move PiP state check exception to the client side
- When calling enterPictureInPictureMode(), the state of the activity in
the client may be out of sync with the state of the activity in the
system, causing an exception to be thrown erroneously. Instead, fail
silently in the system if this occurs, and throw the exception in the
client when it attempts to enter PiP from an invalid state.
Bug:
63753007
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: Ia99cc086805edc31f997d4325f7a5ccd7c85a77e
Justin Klaassen [Wed, 23 Aug 2017 21:53:18 +0000 (14:53 -0700)]
Support l11n of Qualcomm® aptX™ strings
Bug:
63899732
Test: Verified strings in Settings > System > Developer Options.
Change-Id: Ib1fe508d65a670f1f461041afe0978ff641a993c
George Mount [Wed, 23 Aug 2017 21:03:46 +0000 (21:03 +0000)]
Merge "Use hardware bitmap for shared element snapshots." into oc-mr1-dev
am:
230e025841
Change-Id: I8dbb21476f7d38a37c8e5b5732b51255b0bcba14
George Mount [Wed, 23 Aug 2017 20:52:34 +0000 (20:52 +0000)]
Merge "Use hardware bitmap for shared element snapshots." into oc-mr1-dev
Adrian Roos [Wed, 23 Aug 2017 20:51:45 +0000 (20:51 +0000)]
Merge "Ambient Display: Delay charging indicator if about to wake up" into oc-mr1-dev
am:
e45c956f69
Change-Id: Icb6e18a867302d85d877d9bf4a8d33836eac9539
George Mount [Tue, 22 Aug 2017 15:19:56 +0000 (08:19 -0700)]
Use hardware bitmap for shared element snapshots.
Bug:
64851247
Drawing to software bitmaps does not support many
features, most especially hardware bitmaps. This
changes the implementation to using hardware bitmaps
for View snapshots.
Also fixed broken TransitionTest discovered while
testing.
Test: I4ede02db67e578ea4a25069b683f1989c611e06c
Change-Id: I185bbfe1f789055c9efdba5297a74e481607afaf
TreeHugger Robot [Wed, 23 Aug 2017 20:40:42 +0000 (20:40 +0000)]
Merge "Ambient Display: Delay charging indicator if about to wake up" into oc-mr1-dev
Android Build Merger (Role) [Wed, 23 Aug 2017 20:21:16 +0000 (20:21 +0000)]
Merge "Merge "power: throttle interaction hints" into oc-dev am:
78701217fd -s ours am:
dd028e7c26 am:
2adfb7e4b0" into oc-mr1-dev-plus-aosp
Hall Liu [Wed, 23 Aug 2017 20:18:15 +0000 (20:18 +0000)]
Merge "Embms adjustments for 7/28"
Tim Murray [Wed, 23 Aug 2017 20:17:12 +0000 (20:17 +0000)]
Merge "power: throttle interaction hints" into oc-dev am:
78701217fd -s ours am:
dd028e7c26
am:
2adfb7e4b0
Change-Id: I413969f58e660243d1a07c2bbddfb4a05f85a57b
Tim Murray [Wed, 23 Aug 2017 20:14:27 +0000 (20:14 +0000)]
Merge "power: throttle interaction hints" into oc-dev am:
78701217fd -s ours am:
dd028e7c26
am:
ecc48b8bf5
Change-Id: Ibd21e8f9b87fca7ef66ad527cb857eaa17cdf380
jackqdyulei [Wed, 23 Aug 2017 20:01:40 +0000 (20:01 +0000)]
Merge "Remove string power_charging_duration_short" into oc-mr1-dev
am:
367838be4f
Change-Id: Ied709698c4f26958ecaadfd5511af814685df53c
Tim Murray [Wed, 23 Aug 2017 20:01:06 +0000 (20:01 +0000)]
Merge "power: throttle interaction hints" into oc-dev am:
78701217fd -s ours
am:
dd028e7c26
Change-Id: I1bcc02adcc7b74d63e09db1251b13c90630ef7a9
Tim Murray [Wed, 23 Aug 2017 20:01:05 +0000 (20:01 +0000)]
Merge "power: throttle interaction hints" into oc-dev am:
78701217fd -s ours
am:
dd028e7c26
Change-Id: Ie7dae1e15d80fa422fed47efb21a5d388c5be3b2
Tim Murray [Wed, 23 Aug 2017 19:48:14 +0000 (19:48 +0000)]
Merge "power: throttle interaction hints" into oc-dev
am:
78701217fd -s ours
Change-Id: I5135ddb75679ff6e4ffe5bb8daff97daf05deb34
TreeHugger Robot [Wed, 23 Aug 2017 19:38:38 +0000 (19:38 +0000)]
Merge "Remove string power_charging_duration_short" into oc-mr1-dev
Jason Monk [Wed, 23 Aug 2017 19:30:37 +0000 (19:30 +0000)]
Merge "Allow status_bar_height to be RRO controlled" into oc-mr1-dev
am:
45e8fe20de
Change-Id: Ic47deee56fc209b0230eab0358ff426f765735b3
TreeHugger Robot [Wed, 23 Aug 2017 19:25:47 +0000 (19:25 +0000)]
Merge "power: throttle interaction hints" into oc-dev
OSDN Git Service
