Commit Graph

13496 Commits

Author SHA1 Message Date
long.x.qiao
19000b747c Merge "Show search results when query string contains trailing space"
am: 8eb0c24e5a

Change-Id: Ic0382e8b3ce65b52ae2d77987ff4a79945fddb4f
2017-03-01 19:25:42 +00:00
long.x.qiao
9973b01489 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
2017-03-01 21:00:57 +09:00
Meng Wang
e21cbcb6b4 Merge "WiFiCallingSettings: don't start carrier app in onResume"
am: 05c88316ec

Change-Id: I1e212c2486e896ad9945d7881f01895fedb27615
2017-02-27 18:29:48 +00:00
Treehugger Robot
05c88316ec Merge "WiFiCallingSettings: don't start carrier app in onResume" 2017-02-27 18:25:05 +00:00
Meng Wang
d3b0c37ef2 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
2017-02-25 10:23:23 -08:00
Marie Janssen
019c8f38fe Merge "Bluetooth: aim OPEN_RECEIVED_FILES at bluetooth"
am: 17ad73ed9b

Change-Id: Ib26f0014a8ef37f0c1b0e738597690343c30e940
2017-02-25 13:44:29 +00:00
Marie Janssen
41cdfd8887 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
2017-02-25 13:39:16 +00:00
Chen Xu
fbf747bb76 Merge "move ACTION_CARRIER_SETUP intent to public api"
am: d989558616

Change-Id: Ic1b747c58bd8dc786e98bb3786e7ccecee7889be
2017-02-25 01:11:04 +00:00
Chen Xu
d989558616 Merge "move ACTION_CARRIER_SETUP intent to public api" 2017-02-25 01:05:30 +00:00
fionaxu
181138d2d1 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
2017-02-24 10:45:12 -08:00
Marie Janssen
7b9f96983d Merge "Bluetooth: service for pairing notification"
am: 7dfc705ad9

Change-Id: Ib48d174e99ac1debd9cf578c222bdcfd5fc10ea1
2017-02-23 21:52:24 +00:00
Marie Janssen
d06d83c531 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
2017-02-21 14:43:40 -08:00
Philip P. Moltmann
afe6320d70 resolve merge conflicts of 9ac842a753 to nyc-mr2-dev-plus-aosp
Test: built
Change-Id: I156db22c13da98bce0077b2acb8d9f1a3d2ce406
2017-02-14 09:51:34 -08:00
Philip P. Moltmann
9ac842a753 Merge "[DO NOT MERGE] Revert "[DO NOT MERGE] Use new QueuedWork interface."" into nyc-mr2-dev 2017-02-14 16:03:28 +00:00
Philip P. Moltmann
b92663afb1 [DO NOT MERGE] Revert "[DO NOT MERGE] Use new QueuedWork interface."
This reverts commit 81758edffa.

Bug: 30662828
Change-Id: I5c877a3a888f075afcfb9f49ec92cf3ad43f6304
2017-02-13 23:44:55 +00:00
Pavlin Radoslavov
73aa2c6b3f Merge "Add null pointer checks when updating A2DP configuration values" am: 6f7437580c am: bd3f96703c
am: fae23e1e00

Change-Id: I55f901bee2b1a7368cf28cf0b2c6a89e8af27342
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

Change-Id: I04f7187c23a0f17c5ef2d37f75d892e4da54111e
2017-02-11 01:28:22 +00:00
Pavlin Radoslavov
bd3f96703c Merge "Add null pointer checks when updating A2DP configuration values"
am: 6f7437580c

Change-Id: I567042ca38e74e2ce228e4bb03c73095c8cf6513
2017-02-11 01:25:50 +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

Change-Id: I9742b1388b6b8702df0459e77414e3eb273115a8
2017-02-10 18:20:28 +00:00
Marie Janssen
deb32c220b Merge "Remove Bluetooth autoconnect on dock" am: b65c7fc810
am: e7d5b13f53

Change-Id: I696af3c6b2c3a2538e93356041c16f9c7149265c
2017-02-10 18:18:00 +00:00
Marie Janssen
e7d5b13f53 Merge "Remove Bluetooth autoconnect on dock"
am: b65c7fc810

Change-Id: Id3cf62ca55ff39867041b495aa832e220fbf70ee
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
f040f78303 Merge "Provide calling package name in cell info APIs"
am: 5c365f9b54

Change-Id: I342921d22c83aadd77b75078f5d5e9191c8b683f
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

Change-Id: Ia2a1d01f2bb8fb257f756f7df6dfbedb755e87b1
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
Pavlin Radoslavov
2a70967e41 Merge "Catch IllegalStateException when updating Bluetooth A2DP codec info" am: ad62fd52c9 am: 14eb8cfe57
am: 8e81cf1310

Change-Id: I513fdf69abc617944f5e0ce8195d16a451f61590
2017-02-07 04:55:47 +00:00
Pavlin Radoslavov
8e81cf1310 Merge "Catch IllegalStateException when updating Bluetooth A2DP codec info" am: ad62fd52c9
am: 14eb8cfe57

Change-Id: Ie5f7b5157a6034ec7a206758b19cd51e3713fc12
2017-02-07 04:52:47 +00:00
Pavlin Radoslavov
14eb8cfe57 Merge "Catch IllegalStateException when updating Bluetooth A2DP codec info"
am: ad62fd52c9

Change-Id: I790c24917705ed7488ddfa467cb6c09241b34142
2017-02-07 04:50:15 +00: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
Alexey Polyudov
f689441eed fix the build breakage caused by merge resolution
commit 5d409ace19 broke the build

Change-Id: I62f55d8c1d023190af5171864998a2a4b2090a37
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
(cherry picked from commit 8c041f7862)
2017-02-02 21:58:36 +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

Change-Id: I40314d5a74c7c8ede98666d708723f4b6df46165
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

Change-Id: I359020a85c6bc8a5201018f31f5f9fd274b2b94d
2017-02-02 04:35:49 +00:00
Pavlin Radoslavov
0356b740f2 Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings"
am: 78115c0abc

Change-Id: I6e29cc46fb4577973b8e9d6b48a2c8ad48d5531a
2017-02-02 04:32:48 +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

Change-Id: Ib3d154cb753b07278355ec1c34dca5916f619774
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

Change-Id: Ie0ff34a0b8a429caa5119c8bbc42de7b24f3b9ce
2017-02-01 02:16:17 +00:00
Christine Franks
bb6859ca75 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
2017-02-01 00:37:45 +00:00
Pavlin Radoslavov
502de2cfa2 Merge "Update the A2DP Codec Config API" am: bd298a7a50 am: 96dda78d24
am: 6fbaebd7e8

Change-Id: I677b6fdc1280337c5b383aa0e681cba44db23c94
2017-01-31 19:18:46 +00:00
Pavlin Radoslavov
6fbaebd7e8 Merge "Update the A2DP Codec Config API" am: bd298a7a50
am: 96dda78d24

Change-Id: I2cdd1e9117076b17fcf218e8f50a86d9c36b3474
2017-01-31 19:13:20 +00:00
Pavlin Radoslavov
96dda78d24 Merge "Update the A2DP Codec Config API"
am: bd298a7a50

Change-Id: I5d3e3c0d3d6e3d679ad94779600a9e266f7f927b
2017-01-31 19:08:11 +00:00
Philip P. Moltmann
81758edffa [DO NOT MERGE] Use new QueuedWork interface.
Test: Ran SharedPreferences CTS tests

Bug: 33385963
Bug: 30662828

Change-Id: I8025a087b43462324d0d45555094cbb54a671404
(cherry picked from commit 231c9fbfa6)
2017-01-31 02:51:04 +00:00
Pavlin Radoslavov
2829ca322a Update the A2DP Codec Config API
Previously, the JNI upcall would contain only the current codec config.
In the new API, the upcall contains:
 1. The current codec config
 2. The list of codecs containing the local codecs capabilities
 3. The list of codecs containing the selectable codecs capabilities.
    This list is the intersection of the local codecs capabilities
    and the capabilities of the paired device.

Also, refactored the Java internals to accomodate the extra information:
 * Added new class BluetoothCodecStatus that contains the extra info:
   current codec config, local codecs capabilities and selectable
   codecs capabilities
 * Renamed method getCodecConfig() to getCodecStatus() and return the
   corresponding BluetoothCodecStatus object.
 * Updates to class BluetoothCodecConfig:
   new methods isValid(), getCodecName(), and updated toString()
   so it is more user friendly
 * Removed BluetoothCodecConfig.EXTRA_CODEC_CONFIG and
   EXTRA_PREVIOUS_CODEC_CONFIG.
   The former is superseded by BluetoothCodecStatus.EXTRA_CODEC_STATUS;
   the latter is not really used.

Test: A2DP streaming with headsets and switching the codecs

Change-Id: I490a70c82b686be7105862aeaeafcff495369dae
2017-01-30 16:22:24 -08:00
Marie Janssen
1c98d85cf6 Merge "Bluetooth: remove BluetoothDiscoveryReceiver" am: 1ad23a71e4 am: 184506a710
am: 83fb10ae1e

Change-Id: Ib7a51c9cae91202087bfcc11e6eb18b219e84d36
2017-01-30 18:02:01 +00:00