OSDN Git Service
Jerry Zhang [Thu, 24 Aug 2017 22:32:17 +0000 (22:32 +0000)]
Reset functions to null when user changes.
am:
e537a83139
Change-Id: Iea5d61d685c342e87cb96c8bbf3e863a81639c7b
Android Build Merger (Role) [Thu, 24 Aug 2017 22:14:40 +0000 (22:14 +0000)]
Merge "Merge changes from topic "bt-fix-checkstyle-errors" am:
838ab94a0f am:
8ae5462199 am:
24ad4cfc48" into oc-mr1-dev-plus-aosp
Jack He [Thu, 24 Aug 2017 22:10:22 +0000 (22:10 +0000)]
Merge changes from topic "bt-fix-checkstyle-errors" am:
838ab94a0f am:
8ae5462199
am:
24ad4cfc48
Change-Id: I25df75f9cee3ebe0471fa7f9b3375d849ee31339
Chavi Weingarten [Thu, 24 Aug 2017 22:05:16 +0000 (22:05 +0000)]
Merge "Check for null appToken" into oc-mr1-dev
am:
ba893e6a10
Change-Id: Ib99dad7da1d4e639a95f6e276c039946639e88cb
Jack He [Thu, 24 Aug 2017 21:54:51 +0000 (21:54 +0000)]
Merge changes from topic "bt-fix-checkstyle-errors" am:
838ab94a0f
am:
8ae5462199
Change-Id: I44636b8f052b6e48f562f53869dcdfeffbcc0fc9
Shuo Qian [Thu, 24 Aug 2017 21:44:54 +0000 (21:44 +0000)]
Merge "Add new error code in SmsManager" into oc-mr1-dev
am:
1dafcc89a5
Change-Id: I938ddabfe0d98ee1eee850ba9d6aeb857ebb748f
Jack He [Thu, 24 Aug 2017 21:43:08 +0000 (21:43 +0000)]
Merge changes from topic "bt-fix-checkstyle-errors"
am:
838ab94a0f
Change-Id: I4e619cb17582a6cc954814654820cd945f66e1cc
Treehugger Robot [Thu, 24 Aug 2017 21:25:49 +0000 (21:25 +0000)]
Merge changes from topic "bt-fix-checkstyle-errors"
* changes:
Fix checkstyle errors (2/2)
Fix checkstyle errors (1/2)
Chavi Weingarten [Thu, 24 Aug 2017 21:24:33 +0000 (21:24 +0000)]
Merge "Check for null appToken" into oc-mr1-dev
Shuo Qian [Thu, 24 Aug 2017 21:22:31 +0000 (21:22 +0000)]
Merge "Add new error code in SmsManager" into oc-mr1-dev
chaviw [Wed, 23 Aug 2017 19:29:02 +0000 (12:29 -0700)]
Check for null appToken
AppWindowToken can be null for non-app windows.
Test: Existing tests pass
Fixes:
65018183
Change-Id: I81c7e4e2bec40c588771cc46e4a8061c7112765a
Yohei Yukawa [Thu, 24 Aug 2017 21:14:36 +0000 (21:14 +0000)]
Merge "New haptic feedback constants" into oc-mr1-dev
am:
f3b78305ff
Change-Id: I7e3009b6e54a8f443214b68d4f64470475a4acd5
Makoto Onuki [Thu, 24 Aug 2017 21:03:54 +0000 (21:03 +0000)]
Merge "Don't report suspicious periodic sync removal for gone users" into oc-mr1-dev
am:
1fab6234c0
Change-Id: I90b209f4077d858b6a801dd7a195e0c4e268df4c
TreeHugger Robot [Thu, 24 Aug 2017 21:02:57 +0000 (21:02 +0000)]
Merge "New haptic feedback constants" into oc-mr1-dev
Bill Yi [Thu, 24 Aug 2017 20:57:04 +0000 (20:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
faa21e1a6c -s ours
Change-Id: Icffdd7252151b526eb0e96d94c9a5849c3eeaac1
Geoffrey Pitsch [Thu, 24 Aug 2017 20:48:43 +0000 (20:48 +0000)]
Merge "Support keyboard long-press on notifications" into oc-mr1-dev
am:
e7c9d8f905
Change-Id: I0b826bf0f1105b202f3b3368b5cec5568c8ffd6b
Siyamed Sinir [Thu, 24 Aug 2017 20:39:27 +0000 (20:39 +0000)]
Merge changes from topic "siyamed_maxlines" into oc-mr1-dev
am:
faba49c4d3
Change-Id: I2140b3ece38c8081de1b10ae5dbfa32ccf3acf90
TreeHugger Robot [Thu, 24 Aug 2017 20:29:06 +0000 (20:29 +0000)]
Merge "Don't report suspicious periodic sync removal for gone users" into oc-mr1-dev
Andrii Kulian [Thu, 24 Aug 2017 20:14:28 +0000 (20:14 +0000)]
Merge "Apply API review comments for SHOW_WITH_INSECURE_KEYGUARD" into oc-mr1-dev
am:
7ee92d5291
Change-Id: I8bfb1fb9f96489d9d11cc1b587d78b6a08a130ed
TreeHugger Robot [Thu, 24 Aug 2017 20:13:59 +0000 (20:13 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Geoffrey Pitsch [Thu, 24 Aug 2017 20:04:37 +0000 (20:04 +0000)]
Merge "Support keyboard long-press on notifications" into oc-mr1-dev
Lujiang Xue [Thu, 24 Aug 2017 20:03:31 +0000 (20:03 +0000)]
Merge "Add extensionController based on PackageManager FEATURE" into oc-mr1-dev
am:
130d850614
Change-Id: Ie5848073bb6462166ad0c09c84d9a95ac4dbe26a
Siyamed Sinir [Thu, 24 Aug 2017 19:59:22 +0000 (19:59 +0000)]
Merge changes from topic "siyamed_maxlines" into oc-mr1-dev
* changes:
StaticLayout capped height should be 0 when maxLines=0
Reset StaticLayout.mEllipsized during generate()
Andrii Kulian [Thu, 24 Aug 2017 19:59:08 +0000 (19:59 +0000)]
Merge "Apply API review comments for SHOW_WITH_INSECURE_KEYGUARD" into oc-mr1-dev
Etan Cohen [Thu, 24 Aug 2017 19:54:06 +0000 (19:54 +0000)]
Merge "[CS] Allow network factory implementations to re-evaluate requests" into oc-mr1-dev
am:
19f12028b7
Change-Id: I2a99242470c37ca423221ff31e2fdd72ea53d4f1
TreeHugger Robot [Thu, 24 Aug 2017 19:33:53 +0000 (19:33 +0000)]
Merge "Add extensionController based on PackageManager FEATURE" into oc-mr1-dev
TreeHugger Robot [Thu, 24 Aug 2017 19:29:02 +0000 (19:29 +0000)]
Merge "[CS] Allow network factory implementations to re-evaluate requests" into oc-mr1-dev
Jean-Michel Trivi [Thu, 24 Aug 2017 19:21:44 +0000 (19:21 +0000)]
Merge "Audio event logging" into oc-mr1-dev
am:
9961d6968e
Change-Id: I574558660e57b56a1f38b878fac8f25c84051cd7
Beverly [Thu, 24 Aug 2017 19:15:13 +0000 (19:15 +0000)]
Merge "Consistently uses ASCII numbers in notif category translation." into oc-mr1-dev
am:
8f5c9de97e
Change-Id: I32322f1b788bf3a55d92425485d98b58f7b524c7
Jack He [Wed, 23 Aug 2017 04:21:23 +0000 (21:21 -0700)]
Fix checkstyle errors (2/2)
* Manual style corrections with IDE assistance
* Variable name refactors are done through IDE
* Corrected general style errors such as:
- "final private var" -> "private final var"
- "&&", "+", "||" should not be at the end of line
- Non-static private variable should be like "mVar"
- Private static variable should be like "sVar"
- Code file should always end with newline
- Inherited methods should be annotated with @Override
and no @hide tags
- Public methods should always have a JavaDoc entry
- "int[] array" is preferred over "int array[]"
- private methods should be accessed without "this."
when there is no name collisions.
- "boolean ? true : false" -> boolean
- "boolean ? false : true" -> !boolean
- "boolean == true" OR "boolean != false" -> boolean
- "boolean != true" OR "boolean == false" -> !boolean
Bug:
63596319
Test: make checkbuild, no functional changes
Change-Id: Iabdc2be912a32dd63a53213d175cf1bfef268ccd
Jack He [Tue, 22 Aug 2017 23:06:54 +0000 (16:06 -0700)]
Fix checkstyle errors (1/2)
* Automatic style corrections through IDE
Bug:
63596319
Test: make checkbuild, no manual changes, no functional changes
Change-Id: I2397d55abc34c9b7a9b748bec6137778df3421a7
TreeHugger Robot [Thu, 24 Aug 2017 19:04:47 +0000 (19:04 +0000)]
Merge "Audio event logging" into oc-mr1-dev
TreeHugger Robot [Thu, 24 Aug 2017 19:01:55 +0000 (19:01 +0000)]
Merge "Consistently uses ASCII numbers in notif category translation." into oc-mr1-dev
Matthew Ng [Thu, 24 Aug 2017 18:47:48 +0000 (18:47 +0000)]
Merge "Test for writing and loading reduced resolution task snapshots" into oc-mr1-dev
am:
b952c7557e
Change-Id: I66e78a3eb612a16d9dfcac749cb68c4f9e2e7334
TreeHugger Robot [Thu, 24 Aug 2017 18:38:07 +0000 (18:38 +0000)]
Merge "Test for writing and loading reduced resolution task snapshots" into oc-mr1-dev
Selim Cinek [Thu, 24 Aug 2017 18:28:02 +0000 (18:28 +0000)]
Merge "Fixed a bug where we weren't releasing views" into oc-mr1-dev
am:
a782ff3fb7
Change-Id: I03f6527ae3ebd36b6df26a8d3a786157ce8a1d90
David Stevens [Thu, 24 Aug 2017 18:13:55 +0000 (18:13 +0000)]
Merge "Check correct DisplayContent when making window freezing screen" into oc-mr1-dev
am:
06610fc753
Change-Id: I5d282da0356955dd5ca472828d9e0e2d4db7d36b
TreeHugger Robot [Thu, 24 Aug 2017 18:08:05 +0000 (18:08 +0000)]
Merge "Fixed a bug where we weren't releasing views" into oc-mr1-dev
David Stevens [Thu, 24 Aug 2017 17:57:50 +0000 (17:57 +0000)]
Merge "Check correct DisplayContent when making window freezing screen" into oc-mr1-dev
Yohei Yukawa [Thu, 24 Aug 2017 17:51:00 +0000 (10:51 -0700)]
New haptic feedback constants
This CL introduces several haptic feedback constants that are ready
to be exposed to developers.
Test: checkbuild
Fixes:
64537070
Change-Id: If54d5bc6cab4e2c405615b7a40648c74a1097ea3
Geoffrey Pitsch [Fri, 18 Aug 2017 15:15:12 +0000 (11:15 -0400)]
Support keyboard long-press on notifications
ExpandableNotificationRow now handles long-clicks for keyboard support.
SwipeHelper calls performLongClick to trigger the listener on the row.
Now that the View listens to long clicks, SwipeHelper cancels
long-presses on the View when it see touch down events, so the event
doesn't get duped in the touch case.
Bug:
34840327
Test: manual
Change-Id: Ibeb93507781443d6b2dac209afd889b1d8d54aeb
Lujiang Xue [Tue, 22 Aug 2017 21:13:45 +0000 (14:13 -0700)]
Add extensionController based on PackageManager FEATURE
Bug:
64818339
Test: make and flash on 6P and headunit, verified in car mode the phone keep phone status bar, and on headunit, it use car status bar all the time
Change-Id: I6b3de99f4c21a50eb8521bf61f640f12cd6c3f02
Bill Yi [Thu, 24 Aug 2017 16:54:00 +0000 (16:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
f15c825dfb -s ours
Change-Id: I88443420743364bf148b0200e12efcf27cc92df3
Android Build Merger (Role) [Thu, 24 Aug 2017 16:41:17 +0000 (16:41 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
7175b7b929 -s ours am:
1c1e7095f3 -s ours" into oc-mr1-dev-plus-aosp
TreeHugger Robot [Thu, 24 Aug 2017 16:36:57 +0000 (16:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Thu, 24 Aug 2017 16:36:52 +0000 (16:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
7175b7b929 -s ours
am:
1c1e7095f3 -s ours
Change-Id: I349f775c0891b8986ccc17330e2f35086975a947
Android Build Merger (Role) [Thu, 24 Aug 2017 16:34:12 +0000 (16:34 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
1040e35e55 -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Thu, 24 Aug 2017 16:30:24 +0000 (16:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
1040e35e55 -s ours
Change-Id: I1acae1559def3df17786e6a5a120d24bd07adf54
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:12:45 +0000 (16:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
7175b7b929 -s ours
Change-Id: I4be65bdb164ecf13c5d89316fb12d32ca69d8bb6
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:10:01 +0000 (16:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
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
Jean-Michel Trivi [Sun, 20 Aug 2017 01:08:06 +0000 (18:08 -0700)]
Audio event logging
New class AudioEventLogger to store a configurable number of the
last audio events. It hosts a circular buffer of lightweight
event objects, an abstract class whose implementations are
event-specific, and does the heavier string manipulations
at the time of the dump, not during normal operation.
Add logging for:
- phone state (a.k.a. audio mode) changes
- wired device connections
- playback activity monitor
- force use
Test: adb shell dumpsys audio
Bug:
64470715
Change-Id: I8dbd936e2ffec39134f1a8837191c74f5cb9fc56
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
Selim Cinek [Wed, 23 Aug 2017 17:59:57 +0000 (10:59 -0700)]
Fixed a bug where we weren't releasing views
When tracking with the headsuptouchhelper, views
would not be released properly, since we're handing
over the touch to the panel.
This is now fixed.
Test: drag down on heads-up, observe normal motion
Change-Id: Ia9eef07c789d6d03098c2e34f86c16fdeeb93d42
Fixes:
37314754
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
Bill Yi [Thu, 24 Aug 2017 14:25:03 +0000 (07:25 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I02d4cd11add59d4997b549c71b42f1b5d5a14ea2
Etan Cohen [Wed, 23 Aug 2017 15:39:31 +0000 (08:39 -0700)]
[CS] Allow network factory implementations to re-evaluate requests
Change the evalRequests() API to protected to allow network factory
implementations to call the API.
A use-case of the API change is for factories temporarily reject a
request since they cannot fullfill it immediately but retry it at a
later time if/when conditions change.
Bug:
63866251
Test: integration tests
Change-Id: Idc50ce0799c67634b7b2fdbad78a26e443caf2e4
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
Bill Yi [Thu, 24 Aug 2017 12:11:32 +0000 (05:11 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I38d45e58136a2823cda74f3dbfb39c43b9ebe180
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
Bill Yi [Thu, 24 Aug 2017 10:52:49 +0000 (03:52 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ia2ef45e82949155e201cf8e7e058ca9e8ab0833b
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
OSDN Git Service
