OSDN Git Service
Lorenzo Colitti [Mon, 6 Mar 2017 04:04:55 +0000 (04:04 +0000)]
Merge "Display the correct default for mobile data always on."
am:
737d42a0db
Change-Id: I5302cc5cc7d0847e127fcbf8af42fb6eef54c303
Treehugger Robot [Mon, 6 Mar 2017 03:57:50 +0000 (03:57 +0000)]
Merge "Display the correct default for mobile data always on."
minoru.x.sakuma [Mon, 6 Mar 2017 01:22:16 +0000 (01:22 +0000)]
Merge "Unify the design of add icon in setting"
am:
bc9731a575
Change-Id: Ieae295ad277877e52399032908677c15180159d3
Treehugger Robot [Mon, 6 Mar 2017 01:17:55 +0000 (01:17 +0000)]
Merge "Unify the design of add icon in setting"
Lorenzo Colitti [Fri, 3 Mar 2017 07:17:15 +0000 (16:17 +0900)]
Display the correct default for mobile data always on.
Mobile data always on was enabled by changing the default in
ConnectivityService to 1. However, the default value in the
developer options setting was left at 0. This means that by
default (i.e., when the setting is empty), mobile data always on
is enabled but appears in developer options as disabled.
Fix this by changing the default in developer options. This is
simpler than the other options (adding database upgrade code to
settings, making the default be controlled by config.xml and
ensuring that when a config changed broadcast is received the
value is re-rease, hardcoding a default value as an @hide
constant in Settings, etc.)
Bug:
23113288
Test: setting is off after "adb shell settings delete global mobile_data_always_on"
Change-Id: I27e2c0af7a03e510e640dbcfa281449d00385154
minoru.x.sakuma [Mon, 28 Oct 2013 10:35:11 +0000 (19:35 +0900)]
Unify the design of add icon in setting
Add icon "+" displayed in APN setting differs from ones in other
settings like VPN settings, SIP accounts etc. Change the icon to
align with others.
Bug:
35936472
Test: Manually check icon display with fix
Change-Id: I99a57fbeb55bb04f911d28e85752ec04edab6f0e
Peter Qiu [Thu, 2 Mar 2017 16:57:25 +0000 (16:57 +0000)]
Merge "wifi: use Passpoint API when forgetting a Passpoint network"
am:
ff960ed859
Change-Id: I0e085c5c31656c943d7674770ea9f28d963f2726
Treehugger Robot [Thu, 2 Mar 2017 16:52:42 +0000 (16:52 +0000)]
Merge "wifi: use Passpoint API when forgetting a Passpoint network"
Li Bai [Wed, 1 Mar 2017 19:28:38 +0000 (19:28 +0000)]
Merge "Change default long-press time to 400ms"
am:
b96cbedfb2
Change-Id: I953076ce2fe44fb96f2cfbd60e771694c225fc99
Treehugger Robot [Wed, 1 Mar 2017 19:26:15 +0000 (19:26 +0000)]
Merge "Change default long-press time to 400ms"
long.x.qiao [Wed, 1 Mar 2017 19:25:42 +0000 (19:25 +0000)]
Merge "Show search results when query string contains trailing space"
am:
8eb0c24e5a
Change-Id: Ic0382e8b3ce65b52ae2d77987ff4a79945fddb4f
Treehugger Robot [Wed, 1 Mar 2017 19:20:25 +0000 (19:20 +0000)]
Merge "Show search results when query string contains trailing space"
Peter Qiu [Wed, 1 Mar 2017 17:07:34 +0000 (09:07 -0800)]
wifi: use Passpoint API when forgetting a Passpoint network
Use WifiManager#removePasspointConfiguration when forgetting a
Passpoint network to remove the configuration.
This maintains the legacy behavior, where forgetting a Passpoint
network/AP will remove its provider's profile.
Bug:
34207710
Test: manual test
Change-Id: I8b7f6d9fb20fa9f0f0d90566f76c2a39308ce420
long.x.qiao [Tue, 29 Nov 2016 05:50:51 +0000 (13:50 +0800)]
Show search results when query string contains trailing space
The query expression used to search for a term prefix is the prefix
itself with a '*' character appended to it. However, if query string
contains trailing space, the query expresssion (e.g. "screen *") doesn't
work. So to fix this issue, the unnecessary trailing space should be
removed.
Bug:
35231587
Test: manual - go to search in Settings and enter "screen "
Change-Id: Ifa5d96f5d38ad5454272f140da440b8ff55d5614
Meng Wang [Mon, 27 Feb 2017 18:29:48 +0000 (18:29 +0000)]
Merge "WiFiCallingSettings: don't start carrier app in onResume"
am:
05c88316ec
Change-Id: I1e212c2486e896ad9945d7881f01895fedb27615
Treehugger Robot [Mon, 27 Feb 2017 18:25:04 +0000 (18:25 +0000)]
Merge "WiFiCallingSettings: don't start carrier app in onResume"
Meng Wang [Thu, 23 Feb 2017 22:33:49 +0000 (14:33 -0800)]
WiFiCallingSettings: don't start carrier app in onResume
onResume initialize UI before registering switch change listener.
So that listener is not invoked in UI initialization, but only real
switch change by user.
Bug:
33680334
Test: make
Test: manual - carrier app is not invoked in onResume
Change-Id: I7ca1eb1eab214b50c8de72946590c1ecb676d4df
Marie Janssen [Sat, 25 Feb 2017 13:44:29 +0000 (13:44 +0000)]
Merge "Bluetooth: aim OPEN_RECEIVED_FILES at bluetooth"
am:
17ad73ed9b
Change-Id: Ib26f0014a8ef37f0c1b0e738597690343c30e940
Treehugger Robot [Sat, 25 Feb 2017 13:39:27 +0000 (13:39 +0000)]
Merge "Bluetooth: aim OPEN_RECEIVED_FILES at bluetooth"
Marie Janssen [Thu, 23 Feb 2017 19:20:56 +0000 (11:20 -0800)]
Bluetooth: aim OPEN_RECEIVED_FILES at bluetooth
Bluetooth is the receiver for the OPEN_RECEIVED_FILES intent, so we
should aim the intent directly at them.
Test: go to BT settings and click "Open Received Files" in the context
Change-Id: I057215f1faf04c8c735a7e9340325716225ad22d
Fix:
35246073
Chen Xu [Sat, 25 Feb 2017 01:11:04 +0000 (01:11 +0000)]
Merge "move ACTION_CARRIER_SETUP intent to public api"
am:
d989558616
Change-Id: Ic1b747c58bd8dc786e98bb3786e7ccecee7889be
Chen Xu [Sat, 25 Feb 2017 01:05:30 +0000 (01:05 +0000)]
Merge "move ACTION_CARRIER_SETUP intent to public api"
fionaxu [Fri, 24 Feb 2017 18:42:12 +0000 (10:42 -0800)]
move ACTION_CARRIER_SETUP intent to public api
As per CDD: The "android.*" namespace for intent constants is reserved
for public
Android API in AOSP. (Whether public to the full SDK, @SystemApi or
defined in AOSP support libraries.)
ACTION_CARRIER_SETUP intent is generally useful for carrier privileged
apps which is unbundled carrier apps, thus move to public APIs
33679956
Test: Manual
Bug:
33679956
Merged-in: I85dfa99d0b20bb1b534dfe8ead3c274a5c739786
Change-Id: I84ffd5f2c8c3418689ee3d5ff5ddc3f9f7959763
Marie Janssen [Thu, 23 Feb 2017 21:52:24 +0000 (21:52 +0000)]
Merge "Bluetooth: service for pairing notification"
am:
7dfc705ad9
Change-Id: Ib48d174e99ac1debd9cf578c222bdcfd5fc10ea1
Marie Janssen [Thu, 23 Feb 2017 21:41:05 +0000 (21:41 +0000)]
Merge "Bluetooth: service for pairing notification"
Marie Janssen [Wed, 15 Feb 2017 02:49:17 +0000 (18:49 -0800)]
Bluetooth: service for pairing notification
Use a foreground service to show the notification, separating dialog
creation from the receiver.
Test: pair request from remote device while the screen is off
Bug:
35234069
Change-Id: Ia3be3e8efdacf465e095af5a498ef5eb0fca83cd
Junda Liu [Fri, 17 Feb 2017 18:12:27 +0000 (18:12 +0000)]
Ignore orientation change to preserve ApnEditor. am:
f414d58ddf am:
77f75b3859
am:
8db5e61fac
Change-Id: I0b00e7afb390fb91556f0abc5b2bfdee39af767f
Junda Liu [Fri, 17 Feb 2017 18:12:08 +0000 (18:12 +0000)]
Ignore orientation change to preserve ApnEditor. am:
f414d58ddf am:
77f75b3859
am:
1bc3adf38a
Change-Id: Id8fa449ad8bc7f3b36c26ad2bfb0c8d79a04376e
Junda Liu [Fri, 17 Feb 2017 18:07:06 +0000 (18:07 +0000)]
Ignore orientation change to preserve ApnEditor. am:
f414d58ddf
am:
77f75b3859
Change-Id: I9e58a2cb02bc3c71f97ac43061e2ceb5d5702c2e
Junda Liu [Fri, 17 Feb 2017 18:07:06 +0000 (18:07 +0000)]
Ignore orientation change to preserve ApnEditor. am:
f414d58ddf
am:
77f75b3859
Change-Id: Idf45ab75502d89ed26cf082e11f155b7d6201658
Junda Liu [Fri, 17 Feb 2017 18:02:35 +0000 (18:02 +0000)]
Ignore orientation change to preserve ApnEditor.
am:
f414d58ddf
Change-Id: I76b7df13239829f0fbba24db30babf640b2506fd
Bill Yi [Fri, 17 Feb 2017 00:44:39 +0000 (00:44 +0000)]
Import translations. DO NOT MERGE
am:
6f3ae7778c -s ours
Change-Id: I10a744f60859902543922168db03a878614f641e
Bill Yi [Thu, 16 Feb 2017 21:47:19 +0000 (13:47 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie282481af5e8303bdbbdf8f0e91b70cfe433440e
Auto-generated-cl: translation import
Bill Yi [Thu, 16 Feb 2017 15:49:10 +0000 (15:49 +0000)]
Import translations. DO NOT MERGE
am:
7e0985b644 -s ours
Change-Id: I90c3ee4b3610f62d693663cb7372b0e96806e9b5
Bill Yi [Thu, 16 Feb 2017 13:24:28 +0000 (05:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9e1516012801af3f6f21231d6615f9a8969625ed
Auto-generated-cl: translation import
Li Bai [Tue, 31 Jan 2017 06:51:19 +0000 (15:51 +0900)]
Change default long-press time to 400ms
The default long-press time has been changed from 500ms to 400ms by
b/
30159825. so the values for the list of long-press timeout options
in Settings app should be changed.
Bug:
35226519
Test: manual - go to Settings > Accessibility > Touch & hold delay
Change-Id: I8e2421ea4119742bb6bf0e27688c65e3de3099dc
Philip P. Moltmann [Tue, 14 Feb 2017 17:45:51 +0000 (09:45 -0800)]
resolve merge conflicts of
9ac842a753 to nyc-mr2-dev-plus-aosp
Test: built
Change-Id: I156db22c13da98bce0077b2acb8d9f1a3d2ce406
Philip P. Moltmann [Tue, 14 Feb 2017 16:03:27 +0000 (16:03 +0000)]
Merge "[DO NOT MERGE] Revert "[DO NOT MERGE] Use new QueuedWork interface."" into nyc-mr2-dev
Philip P. Moltmann [Mon, 13 Feb 2017 20:58:46 +0000 (20:58 +0000)]
[DO NOT MERGE] Revert "[DO NOT MERGE] Use new QueuedWork interface."
This reverts commit
81758edffae751c31fb1795febe470c171f7fb1b.
Bug:
30662828
Change-Id: I5c877a3a888f075afcfb9f49ec92cf3ad43f6304
Bill Yi [Mon, 13 Feb 2017 17:31:14 +0000 (17:31 +0000)]
Import translations. DO NOT MERGE
am:
da8a98fb26 -s ours
Change-Id: I111397e147e83c3cc0e8d83d365627792035b238
Bill Yi [Mon, 13 Feb 2017 07:02:41 +0000 (23:02 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia85aa9d355617a44a438932f30332cfcbb70842a
Auto-generated-cl: translation import
Fan Zhang [Sun, 12 Feb 2017 01:42:03 +0000 (01:42 +0000)]
DO NOT MERGE Fix "3 dot" icon size so it displays fully
am:
fa190d437b
Change-Id: I7deb37ac62ff85f37d945d453bd6285a809779f1
Fan Zhang [Sat, 11 Feb 2017 18:50:13 +0000 (10:50 -0800)]
DO NOT MERGE Fix "3 dot" icon size so it displays fully
Viewport size was set wrong due to bad merge, causing the last dot got
truncated slightly.
Change-Id: I5d5bbd703e780b21957613d88a2250bc3ba69bb8
Fix:
28194068
Test: visual
Pavlin Radoslavov [Sat, 11 Feb 2017 01:31:52 +0000 (01:31 +0000)]
Merge "Add null pointer checks when updating A2DP configuration values" am:
6f7437580c am:
bd3f96703c
am:
fae23e1e00
Change-Id: I55f901bee2b1a7368cf28cf0b2c6a89e8af27342
Pavlin Radoslavov [Sat, 11 Feb 2017 01:28:22 +0000 (01:28 +0000)]
Merge "Add null pointer checks when updating A2DP configuration values" am:
6f7437580c
am:
bd3f96703c
Change-Id: I04f7187c23a0f17c5ef2d37f75d892e4da54111e
Pavlin Radoslavov [Sat, 11 Feb 2017 01:25:50 +0000 (01:25 +0000)]
Merge "Add null pointer checks when updating A2DP configuration values"
am:
6f7437580c
Change-Id: I567042ca38e74e2ce228e4bb03c73095c8cf6513
Treehugger Robot [Sat, 11 Feb 2017 01:21:25 +0000 (01:21 +0000)]
Merge "Add null pointer checks when updating A2DP configuration values"
Pavlin Radoslavov [Fri, 10 Feb 2017 20:52:04 +0000 (12:52 -0800)]
Add null pointer checks when updating A2DP configuration values
Under expected circumstances, those null pointer checks are not
needed: onCreate() is always called before onCreateView(),
and the former creates the objects: mBluetoothSelectA2dpCodec,
mBluetoothSelectA2dpSampleRate, mBluetoothSelectA2dpBitsPerSample,
mBluetoothSelectA2dpChannelMode, mBluetoothSelectA2dpLdacPlaybackQuality .
For some unknown reason, somehow the following chain of calls is executed
before onCreate() :
onCreateView() ->
getActivity().registerReceiver(mBluetoothA2dpReceiver, ...) ->
mBluetoothA2dpReceiver.onReceive(...) ->
updateBluetoothA2dpConfigurationValues()
Adding the null pointer checks until the issue is understood.
Test: Code compilation
Bug:
35204511
Change-Id: I7c1d81015e66b26544b7b26f36cbc75f11713496
Marie Janssen [Fri, 10 Feb 2017 18:20:28 +0000 (18:20 +0000)]
Merge "Remove Bluetooth autoconnect on dock" am:
b65c7fc810 am:
e7d5b13f53
am:
deb32c220b
Change-Id: I9742b1388b6b8702df0459e77414e3eb273115a8
Marie Janssen [Fri, 10 Feb 2017 18:18:00 +0000 (18:18 +0000)]
Merge "Remove Bluetooth autoconnect on dock" am:
b65c7fc810
am:
e7d5b13f53
Change-Id: I696af3c6b2c3a2538e93356041c16f9c7149265c
Marie Janssen [Fri, 10 Feb 2017 18:15:28 +0000 (18:15 +0000)]
Merge "Remove Bluetooth autoconnect on dock"
am:
b65c7fc810
Change-Id: Id3cf62ca55ff39867041b495aa832e220fbf70ee
Treehugger Robot [Fri, 10 Feb 2017 18:12:00 +0000 (18:12 +0000)]
Merge "Remove Bluetooth autoconnect on dock"
Sooraj Sasindran [Fri, 10 Feb 2017 05:57:31 +0000 (05:57 +0000)]
Merge "Provide calling package name in cell info APIs" am:
5c365f9b54 am:
f040f78303 -s ours
am:
56741e2f41 -s ours
Change-Id: Icdde072f471c1c5823235cb6608bcfc87b629325
Sooraj Sasindran [Fri, 10 Feb 2017 05:50:27 +0000 (05:50 +0000)]
Merge "Provide calling package name in cell info APIs" am:
5c365f9b54
am:
f040f78303 -s ours
Change-Id: Ia62560a2bd59edee436ee71338495e45d50b68be
Sooraj Sasindran [Fri, 10 Feb 2017 05:45:18 +0000 (05:45 +0000)]
Merge "Provide calling package name in cell info APIs"
am:
5c365f9b54
Change-Id: I342921d22c83aadd77b75078f5d5e9191c8b683f
Sooraj Sasindran [Fri, 10 Feb 2017 05:38:40 +0000 (05:38 +0000)]
Merge "Provide calling package name in cell info APIs"
Marie Janssen [Fri, 10 Feb 2017 04:02:52 +0000 (20:02 -0800)]
Remove Bluetooth autoconnect on dock
Test: compiles
Change-Id: I31305c70269c685893132f14975c32a051280afc
Fix:
35219649
Sooraj Sasindran [Fri, 10 Feb 2017 03:04:08 +0000 (03:04 +0000)]
Provide calling package name in cell info APIs
am:
63d90ed55d
Change-Id: Ia2a1d01f2bb8fb257f756f7df6dfbedb755e87b1
Sooraj Sasindran [Thu, 18 Aug 2016 22:49:49 +0000 (15:49 -0700)]
Provide calling package name in cell info APIs
Provide calling package name in cell info APIs
BUG=
31041780
Merged-In: Iad6e5c67ead2bf50d83d1ccad48c3f0341f53712
Change-Id: Iad6e5c67ead2bf50d83d1ccad48c3f0341f53712
Sooraj Sasindran [Thu, 18 Aug 2016 22:49:49 +0000 (15:49 -0700)]
Provide calling package name in cell info APIs
Provide calling package name in cell info APIs
BUG=
31041780
Merged-In: Iad6e5c67ead2bf50d83d1ccad48c3f0341f53712
Change-Id: Iad6e5c67ead2bf50d83d1ccad48c3f0341f53712
Bill Yi [Thu, 9 Feb 2017 07:50:02 +0000 (07:50 +0000)]
Import translations. DO NOT MERGE
am:
f9ef17c68e -s ours
Change-Id: I513f51ecded981e02286080868d12e12e008c5d9
Bill Yi [Thu, 9 Feb 2017 02:55:40 +0000 (18:55 -0800)]
Import translations. DO NOT MERGE
Change-Id: I48c8f3d9a4b34c83e0bc5737446c002584ef86a7
Auto-generated-cl: translation import
Junda Liu [Sat, 4 Feb 2017 00:39:23 +0000 (16:39 -0800)]
Ignore orientation change to preserve ApnEditor.
Test: manually w/ Vzw and Tmo SIM on marlin. UI rotates while preserving
all values
Bug: b/
34956985
Change-Id: I1db34893fd91f99e38913565e7b67ccbfdcb0c93
(cherry picked from commit
76ad635ef7b5604cb314e244e1d7c42df020e743)
Junda Liu [Tue, 7 Feb 2017 20:40:12 +0000 (20:40 +0000)]
Merge "Ignore orientation change to preserve ApnEditor." into nyc-mr2-dev
am:
18fce0a7cf
Change-Id: I0492b3bd442c381f2b7b75707719cc3631bda796
Junda Liu [Tue, 7 Feb 2017 20:40:11 +0000 (20:40 +0000)]
Ignore orientation change to preserve ApnEditor.
am:
76ad635ef7
Change-Id: Ic32658c295821565d1c20245d0f8cb99942639e6
Junda Liu [Tue, 7 Feb 2017 20:35:46 +0000 (20:35 +0000)]
Merge "Ignore orientation change to preserve ApnEditor." into nyc-mr2-dev
Pavlin Radoslavov [Tue, 7 Feb 2017 04:55:47 +0000 (04:55 +0000)]
Merge "Catch IllegalStateException when updating Bluetooth A2DP codec info" am:
ad62fd52c9 am:
14eb8cfe57
am:
8e81cf1310
Change-Id: I513fdf69abc617944f5e0ce8195d16a451f61590
Pavlin Radoslavov [Tue, 7 Feb 2017 04:52:47 +0000 (04:52 +0000)]
Merge "Catch IllegalStateException when updating Bluetooth A2DP codec info" am:
ad62fd52c9
am:
14eb8cfe57
Change-Id: Ie5f7b5157a6034ec7a206758b19cd51e3713fc12
Pavlin Radoslavov [Tue, 7 Feb 2017 04:50:15 +0000 (04:50 +0000)]
Merge "Catch IllegalStateException when updating Bluetooth A2DP codec info"
am:
ad62fd52c9
Change-Id: I790c24917705ed7488ddfa467cb6c09241b34142
Treehugger Robot [Tue, 7 Feb 2017 04:45:35 +0000 (04:45 +0000)]
Merge "Catch IllegalStateException when updating Bluetooth A2DP codec info"
Bill Yi [Tue, 7 Feb 2017 04:24:45 +0000 (04:24 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
b6c4241725 -s ours
Change-Id: Iddf470490c3be31666fe5e13776c3e0fb876dcd7
Bill Yi [Tue, 7 Feb 2017 04:24:44 +0000 (04:24 +0000)]
Import translations. DO NOT MERGE
am:
5d0af58793 -s ours
Change-Id: I779857080f5a48925a15904ff7090e3f95ed71ca
TreeHugger Robot [Tue, 7 Feb 2017 04:20:22 +0000 (04:20 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Tue, 7 Feb 2017 01:12:48 +0000 (17:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iad621de4653a4ebbf3e3161a58ec8edb40e26022
Auto-generated-cl: translation import
Pavlin Radoslavov [Mon, 6 Feb 2017 23:37:01 +0000 (15:37 -0800)]
Catch IllegalStateException when updating Bluetooth A2DP codec info
Add an explicit check when calling getResources() inside
updateBluetoothA2dpConfigurationValues().
This fixes a potential race condition - the latter could be called
in background when processing intent update.
Bug:
35021206
Test: Manual UI testing
Change-Id: I38117c5b1e08f4b2ecfd7637bb3e34920aa0d296
Fan Zhang [Mon, 6 Feb 2017 23:03:11 +0000 (23:03 +0000)]
Update "more" icon so the 3 dots are perfectly round.
am:
de172c7727
Change-Id: I66f612778874d84e23f0e757b4138df1672c4226
Fan Zhang [Mon, 6 Feb 2017 20:39:00 +0000 (12:39 -0800)]
Update "more" icon so the 3 dots are perfectly round.
Bug:
28194068
Test: visual
Change-Id: I23040c7fa638084fc653484e431039701c34bcb0
Junda Liu [Sat, 4 Feb 2017 00:39:23 +0000 (16:39 -0800)]
Ignore orientation change to preserve ApnEditor.
Test: manually w/ Vzw and Tmo SIM on marlin. UI rotates while preserving
all values
Bug: b/
34956985
Change-Id: I1db34893fd91f99e38913565e7b67ccbfdcb0c93
Bill Yi [Fri, 3 Feb 2017 09:34:34 +0000 (09:34 +0000)]
Import translations. DO NOT MERGE
am:
10246513d7 -s ours
Change-Id: I0fa5e10f5b31f605da8ce6555b6a6963c6b1dc3c
Bill Yi [Fri, 3 Feb 2017 07:43:15 +0000 (23:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia85a96f8c54e8cf487af5a395ab222b7fe25db15
Auto-generated-cl: translation import
Alexey Polyudov [Thu, 2 Feb 2017 20:59:34 +0000 (12:59 -0800)]
fix the build breakage caused by merge resolution
commit
5d409ace19fa1d8d14d099c63f04ba45e4d578a8 broke the build
Change-Id: I62f55d8c1d023190af5171864998a2a4b2090a37
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
(cherry picked from commit
8c041f786200bed1050e8155aa620c02ab5db5cf)
Philip P. Moltmann [Thu, 2 Feb 2017 19:34:48 +0000 (19:34 +0000)]
Merge "[DO NOT MERGE] Use new QueuedWork interface." into nyc-mr2-dev
am:
47c8abaa67
Change-Id: I55c9981c4082af3d67cb68ea27147962405ce97d
Alexey Polyudov [Thu, 2 Feb 2017 19:11:29 +0000 (11:11 -0800)]
resolve merge conflicts of
81758edffa to nyc-mr2-dev-plus-aosp
Change-Id: Ie5f768b3986b1a2847503ed0871dc1dc79007d88
Pavlin Radoslavov [Thu, 2 Feb 2017 04:38:17 +0000 (04:38 +0000)]
Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings" am:
78115c0abc am:
0356b740f2
am:
33b4688634
Change-Id: I40314d5a74c7c8ede98666d708723f4b6df46165
Pavlin Radoslavov [Thu, 2 Feb 2017 04:35:49 +0000 (04:35 +0000)]
Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings" am:
78115c0abc
am:
0356b740f2
Change-Id: I359020a85c6bc8a5201018f31f5f9fd274b2b94d
Pavlin Radoslavov [Thu, 2 Feb 2017 04:32:48 +0000 (04:32 +0000)]
Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings"
am:
78115c0abc
Change-Id: I6e29cc46fb4577973b8e9d6b48a2c8ad48d5531a
Treehugger Robot [Thu, 2 Feb 2017 04:29:15 +0000 (04:29 +0000)]
Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings"
Pavlin Radoslavov [Thu, 2 Feb 2017 01:40:39 +0000 (17:40 -0800)]
Add missing null pointer check for Bluetooth A2DP Codec Settings
Bug:
34885602
Test: Code compilation
Change-Id: I13443390e7c6ffa34b5957a588fc0cefdf5b80f5
TreeHugger Robot [Wed, 1 Feb 2017 23:08:53 +0000 (23:08 +0000)]
Merge "[DO NOT MERGE] Use new QueuedWork interface." into nyc-mr2-dev
Christine Franks [Wed, 1 Feb 2017 19:14:41 +0000 (19:14 +0000)]
DO NOT MERGE - Require password to FR in carrier demo mode
am:
22430d5abb
Change-Id: Ib3d154cb753b07278355ec1c34dca5916f619774
Christine Franks [Fri, 20 Jan 2017 19:24:14 +0000 (11:24 -0800)]
DO NOT MERGE - Require password to FR in carrier demo mode
Bug:
34341567
Test: manual - password is not required for regular user factory
resets and is required in carrier demo mode.
Change-Id: Icadb6edb3d85ae58b45862c182b6b03bf2c3ce16
Christine Franks [Wed, 1 Feb 2017 02:16:17 +0000 (02:16 +0000)]
DO NOT MERGE - Allow FR in carrier demo mode
am:
bb6859ca75
Change-Id: Ie0ff34a0b8a429caa5119c8bbc42de7b24f3b9ce
Christine Franks [Tue, 24 Jan 2017 00:44:02 +0000 (16:44 -0800)]
DO NOT MERGE - Allow FR in carrier demo mode
Bug:
34341567
Test: manual - in carrier demo mode, go to Settings > Backup and
Reset > Factory data reset > Reset phone > Erase everything and
this entire path is viewable.
Change-Id: I373a2e94f205f6e6e4dd9a54dcf08532a64e5187
Marie Janssen [Tue, 31 Jan 2017 19:24:12 +0000 (19:24 +0000)]
Merge "Bluetooth: remove unused SINK_STATE_CHANGED action" am:
fb0ab547c2 am:
e10af2add7
am:
5741187f31
Change-Id: I7ecebb4aebb9755571baebf00718156d28415f3e
Pavlin Radoslavov [Tue, 31 Jan 2017 19:18:46 +0000 (19:18 +0000)]
Merge "Update the A2DP Codec Config API" am:
bd298a7a50 am:
96dda78d24
am:
6fbaebd7e8
Change-Id: I677b6fdc1280337c5b383aa0e681cba44db23c94
Marie Janssen [Tue, 31 Jan 2017 19:16:35 +0000 (19:16 +0000)]
Merge "Bluetooth: remove unused SINK_STATE_CHANGED action" am:
fb0ab547c2
am:
e10af2add7
Change-Id: I29267583329aba9eae91863e83641a00f12cae9d
Marie Janssen [Tue, 31 Jan 2017 19:14:47 +0000 (19:14 +0000)]
Merge "Bluetooth: remove unused SINK_STATE_CHANGED action"
am:
fb0ab547c2
Change-Id: Ib054cb7d23a28d45345ef680247b5788fbc989f4
Pavlin Radoslavov [Tue, 31 Jan 2017 19:13:20 +0000 (19:13 +0000)]
Merge "Update the A2DP Codec Config API" am:
bd298a7a50
am:
96dda78d24
Change-Id: I2cdd1e9117076b17fcf218e8f50a86d9c36b3474
Marie Janssen [Tue, 31 Jan 2017 19:09:34 +0000 (19:09 +0000)]
Merge "Bluetooth: remove unused SINK_STATE_CHANGED action"
Pavlin Radoslavov [Tue, 31 Jan 2017 19:08:11 +0000 (19:08 +0000)]
Merge "Update the A2DP Codec Config API"
am:
bd298a7a50
Change-Id: I5d3e3c0d3d6e3d679ad94779600a9e266f7f927b
OSDN Git Service
