Fan Zhang
fa190d437b
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
2017-02-11 16:00:31 -08:00
Pavlin Radoslavov
73aa2c6b3f
Merge "Add null pointer checks when updating A2DP configuration values" am: 6f7437580c am: bd3f96703c
...
am: fae23e1e00
2017-02-11 01:31:52 +00:00
Pavlin Radoslavov
fae23e1e00
Merge "Add null pointer checks when updating A2DP configuration values" am: 6f7437580c
...
am: bd3f96703c
2017-02-11 01:28:22 +00:00
Pavlin Radoslavov
bd3f96703c
Merge "Add null pointer checks when updating A2DP configuration values"
...
am: 6f7437580c
2017-02-11 01:25:50 +00:00
Treehugger Robot
6f7437580c
Merge "Add null pointer checks when updating A2DP configuration values"
2017-02-11 01:21:26 +00:00
Pavlin Radoslavov
c851f854bb
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
2017-02-10 12:52:04 -08:00
Marie Janssen
76405153d1
Merge "Remove Bluetooth autoconnect on dock" am: b65c7fc810 am: e7d5b13f53
...
am: deb32c220b
2017-02-10 18:20:28 +00:00
Marie Janssen
deb32c220b
Merge "Remove Bluetooth autoconnect on dock" am: b65c7fc810
...
am: e7d5b13f53
2017-02-10 18:18:00 +00:00
Marie Janssen
e7d5b13f53
Merge "Remove Bluetooth autoconnect on dock"
...
am: b65c7fc810
2017-02-10 18:15:28 +00:00
Treehugger Robot
b65c7fc810
Merge "Remove Bluetooth autoconnect on dock"
2017-02-10 18:12:01 +00:00
Sooraj Sasindran
8bf0c2bce9
Merge "Provide calling package name in cell info APIs" am: 5c365f9b54 am: f040f78303 -s ours
...
am: 56741e2f41
2017-02-10 05:57:31 +00:00
Sooraj Sasindran
56741e2f41
Merge "Provide calling package name in cell info APIs" am: 5c365f9b54
...
am: f040f78303
2017-02-10 05:50:27 +00:00
Sooraj Sasindran
f040f78303
Merge "Provide calling package name in cell info APIs"
...
am: 5c365f9b54
2017-02-10 05:45:18 +00:00
Sooraj Sasindran
5c365f9b54
Merge "Provide calling package name in cell info APIs"
2017-02-10 05:38:41 +00:00
Marie Janssen
c2ab27e2f8
Remove Bluetooth autoconnect on dock
...
Test: compiles
Change-Id: I31305c70269c685893132f14975c32a051280afc
Fix: 35219649
2017-02-09 20:02:52 -08:00
Sooraj Sasindran
0ed4162914
Provide calling package name in cell info APIs
...
am: 63d90ed55d
2017-02-10 03:04:08 +00:00
Sooraj Sasindran
63d90ed55d
Provide calling package name in cell info APIs
...
Provide calling package name in cell info APIs
BUG=31041780
Merged-In: Iad6e5c67ead2bf50d83d1ccad48c3f0341f53712
Change-Id: Iad6e5c67ead2bf50d83d1ccad48c3f0341f53712
2017-02-09 16:35:46 -08:00
Sooraj Sasindran
8cd6d07ef2
Provide calling package name in cell info APIs
...
Provide calling package name in cell info APIs
BUG=31041780
Merged-In: Iad6e5c67ead2bf50d83d1ccad48c3f0341f53712
Change-Id: Iad6e5c67ead2bf50d83d1ccad48c3f0341f53712
2017-02-09 22:01:56 +00:00
Bill Yi
041604d96c
Import translations. DO NOT MERGE
...
am: f9ef17c68e
2017-02-09 07:50:02 +00:00
Bill Yi
f9ef17c68e
Import translations. DO NOT MERGE
...
Change-Id: I48c8f3d9a4b34c83e0bc5737446c002584ef86a7
Auto-generated-cl: translation import
2017-02-08 18:55:40 -08:00
Junda Liu
f414d58ddf
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 76ad635ef7
2017-02-08 18:04:24 +00:00
Junda Liu
dd9d72df53
Merge "Ignore orientation change to preserve ApnEditor." into nyc-mr2-dev
...
am: 18fce0a7cf
2017-02-07 20:40:12 +00:00
Junda Liu
d7a13ef2b6
Ignore orientation change to preserve ApnEditor.
...
am: 76ad635ef7
2017-02-07 20:40:11 +00:00
Junda Liu
18fce0a7cf
Merge "Ignore orientation change to preserve ApnEditor." into nyc-mr2-dev
2017-02-07 20:35:47 +00:00
Pavlin Radoslavov
2a70967e41
Merge "Catch IllegalStateException when updating Bluetooth A2DP codec info" am: ad62fd52c9 am: 14eb8cfe57
...
am: 8e81cf1310
2017-02-07 04:55:47 +00:00
Pavlin Radoslavov
8e81cf1310
Merge "Catch IllegalStateException when updating Bluetooth A2DP codec info" am: ad62fd52c9
...
am: 14eb8cfe57
2017-02-07 04:52:47 +00:00
Pavlin Radoslavov
14eb8cfe57
Merge "Catch IllegalStateException when updating Bluetooth A2DP codec info"
...
am: ad62fd52c9
2017-02-07 04:50:15 +00:00
Treehugger Robot
ad62fd52c9
Merge "Catch IllegalStateException when updating Bluetooth A2DP codec info"
2017-02-07 04:45:36 +00:00
Bill Yi
f78eb881f1
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: b6c4241725
2017-02-07 04:24:45 +00:00
Bill Yi
edf73ab967
Import translations. DO NOT MERGE
...
am: 5d0af58793
2017-02-07 04:24:44 +00:00
TreeHugger Robot
b6c4241725
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
2017-02-07 04:20:23 +00:00
Bill Yi
5d0af58793
Import translations. DO NOT MERGE
...
Change-Id: Iad621de4653a4ebbf3e3161a58ec8edb40e26022
Auto-generated-cl: translation import
2017-02-06 17:12:48 -08:00
Pavlin Radoslavov
a4efdf5195
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
2017-02-06 15:37:01 -08:00
Fan Zhang
5b27d0638e
Update "more" icon so the 3 dots are perfectly round.
...
am: de172c7727
2017-02-06 23:03:11 +00:00
Fan Zhang
de172c7727
Update "more" icon so the 3 dots are perfectly round.
...
Bug: 28194068
Test: visual
Change-Id: I23040c7fa638084fc653484e431039701c34bcb0
2017-02-06 20:40:22 +00:00
Junda Liu
76ad635ef7
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
2017-02-06 19:14:42 +00:00
Bill Yi
311e4b4212
Import translations. DO NOT MERGE
...
am: 10246513d7
2017-02-03 09:34:34 +00:00
Bill Yi
10246513d7
Import translations. DO NOT MERGE
...
Change-Id: Ia85a96f8c54e8cf487af5a395ab222b7fe25db15
Auto-generated-cl: translation import
2017-02-02 23:43:15 -08:00
Alexey Polyudov
f689441eed
fix the build breakage caused by merge resolution
...
commit 5d409ace19apolyudov@google.com >
(cherry picked from commit 8c041f7862
2017-02-02 21:58:36 +00:00
Philip P. Moltmann
40046d4316
Merge "[DO NOT MERGE] Use new QueuedWork interface." into nyc-mr2-dev
...
am: 47c8abaa67
2017-02-02 19:34:48 +00:00
Alexey Polyudov
5d409ace19
resolve merge conflicts of 81758edffa to nyc-mr2-dev-plus-aosp
...
Change-Id: Ie5f768b3986b1a2847503ed0871dc1dc79007d88
2017-02-02 11:11:29 -08:00
Pavlin Radoslavov
068780c052
Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings" am: 78115c0abc am: 0356b740f2
...
am: 33b4688634
2017-02-02 04:38:17 +00:00
Pavlin Radoslavov
33b4688634
Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings" am: 78115c0abc
...
am: 0356b740f2
2017-02-02 04:35:49 +00:00
Pavlin Radoslavov
0356b740f2
Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings"
...
am: 78115c0abc
2017-02-02 04:32:48 +00:00
Treehugger Robot
78115c0abc
Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings"
2017-02-02 04:29:16 +00:00
Pavlin Radoslavov
789d21d475
Add missing null pointer check for Bluetooth A2DP Codec Settings
...
Bug: 34885602
Test: Code compilation
Change-Id: I13443390e7c6ffa34b5957a588fc0cefdf5b80f5
2017-02-01 17:43:23 -08:00
TreeHugger Robot
47c8abaa67
Merge "[DO NOT MERGE] Use new QueuedWork interface." into nyc-mr2-dev
2017-02-01 23:08:54 +00:00
Christine Franks
91bd9f3072
DO NOT MERGE - Require password to FR in carrier demo mode
...
am: 22430d5abb
2017-02-01 19:14:41 +00:00
Christine Franks
22430d5abb
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
2017-02-01 09:37:28 -08:00
Christine Franks
ff43d8f3b7
DO NOT MERGE - Allow FR in carrier demo mode
...
am: bb6859ca75
2017-02-01 02:16:17 +00:00
