Commit Graph

369928 Commits

Author SHA1 Message Date
Makoto Onuki
fc4dec32af Merge "Don't log account name on logcat (cherry-pick from master)" into pi-dev 2019-01-17 17:56:25 +00:00
TreeHugger Robot
f69dfb9b2f Merge "BluetoothManagerService: catch NoSuchElementException for unlinkToDeath" into pi-dev 2019-01-16 09:08:44 +00:00
Makoto Onuki
5fc6002de5 Don't log account name on logcat (cherry-pick from master)
Test: manual test
- dumpsys content still shows accounts
- logcat doesn't show account names after "adb shell requestsync"
Bug: 121987496

Change-Id: I853c9b77cbb331eb5138f0f774365f405f321fd2
Merged-In: Ic4b8448d10936c9368b1aab208ae7d8e78c3a1ae
2019-01-15 14:45:46 -08:00
TreeHugger Robot
4e3076b1a2 Merge "AdapterService: Only bind HeadsetService in ON state." into pi-dev 2019-01-15 22:34:37 +00:00
Julia Reynolds
571afb3b78 Merge "Actually use listener hints?" into pi-dev 2019-01-15 18:02:07 +00:00
Julia Reynolds
9aee2841e8 Actually use listener hints?
Mute notifications based on their audio attributes
if HINT_HOST_DISABLE_NOTIFICATION_EFFECTS or
HINT_HOST_DISABLE_CALL_EFFECTS is enabled.

Test: atest
Change-Id: I6404eecdce17f390154b3bafee7aa4d18a8ca5b2
Merged-In: db7081e30a
Fixes: 120505040
(cherry picked from commit db7081e30a)
2019-01-15 15:25:33 +00:00
Howard Yen
de18a38e31 Merge changes from topic "b/121448199" into pi-dev
* changes:
  Make sure mCurrentUsbFunctionsRequested flag be updated currectly
  Check for preexisting flag before enabling the gadget
2019-01-15 03:55:00 +00:00
TreeHugger Robot
2a8a4d56fe Merge "Fix stuck notifications" into pi-dev 2019-01-15 01:10:33 +00:00
Julia Reynolds
ac3f14ef08 Fix stuck notifications
Don't tell listeners about changes to enqueued notifications;
they'll pick up the changes in the post notification runnable.

Change-Id: I56c4ba79bcf42c30ad9a0da936eb0b774a6f3f08
Merged-In: I56c4ba79bcf42c30ad9a0da936eb0b774a6f3f08
Fixes: 74236718
Test: runtest systemui-notification
2019-01-14 21:35:26 +00:00
Bill Yi
273e07d78d Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I38e9b6203709ba448cccf1ae74f8308c16119f54
2019-01-12 21:20:57 -08:00
TreeHugger Robot
3f3c8f812e Merge "Nullify the default wallpaper component if it does not exist" into pi-dev 2019-01-11 03:36:19 +00:00
Guliz Tuncay
8f70a490da [automerger skipped] [automerger] Select only preinstalled Spell Checker Services am: ed5973b8a8 am: 5ab7f995ba am: d71a5db522 am: 276e18c147 am: d962aabf4c am: 3c2abaa4da am: 04206067b9 -s ours
am: cf8145858c -s ours
am skip reason: change_id Idab3ecc246fe9344a09e6907a0ba39f8ea6506f9 with SHA1 dd8b0a6bc8 is in history

Change-Id: Ia33298579013130b2d3394fd670345e5a25c3f65
2019-01-10 17:09:56 -08:00
Bryan Ferris
07ca0e8747 [automerger skipped] [automerger] Revert "Select only preinstalled Spell Checker Services" am: 170e24d4e1 am: fb3b187f10 am: 7abf49d3b7 am: 1684713f2e am: cd6eba50ba am: 576e4ac184 am: d596c0e4ef -s ours
am: 34a17e0e25 -s ours
am skip reason: change_id Idab3ecc246fe9344a09e6907a0ba39f8ea6506f9 with SHA1 dd8b0a6bc8 is in history

Change-Id: I7b4326dff6adb744cabbbc0f57e72b23102bb576
2019-01-10 17:00:34 -08:00
Guliz Tuncay
cf8145858c [automerger skipped] [automerger] Select only preinstalled Spell Checker Services am: ed5973b8a8 am: 5ab7f995ba am: d71a5db522 am: 276e18c147 am: d962aabf4c am: 3c2abaa4da
am: 04206067b9 -s ours
am skip reason: change_id Idab3ecc246fe9344a09e6907a0ba39f8ea6506f9 with SHA1 dd8b0a6bc8 is in history

Change-Id: I8be93eede6f7dcffc94905b5a790b1a813f28699
2019-01-10 16:44:22 -08:00
Bryan Ferris
34a17e0e25 [automerger skipped] [automerger] Revert "Select only preinstalled Spell Checker Services" am: 170e24d4e1 am: fb3b187f10 am: 7abf49d3b7 am: 1684713f2e am: cd6eba50ba am: 576e4ac184
am: d596c0e4ef -s ours
am skip reason: change_id Idab3ecc246fe9344a09e6907a0ba39f8ea6506f9 with SHA1 dd8b0a6bc8 is in history

Change-Id: Ie171e4463c7d5ba062f5c978c47ff5560037acb6
2019-01-10 16:36:37 -08:00
Guliz Tuncay
04206067b9 [automerger] Select only preinstalled Spell Checker Services am: ed5973b8a8 am: 5ab7f995ba am: d71a5db522 am: 276e18c147 am: d962aabf4c
am: 3c2abaa4da

Change-Id: I2b4a8618280a602b4eb42db9bf822a14324b587f
2019-01-10 16:21:07 -08:00
Bryan Ferris
d596c0e4ef [automerger] Revert "Select only preinstalled Spell Checker Services" am: 170e24d4e1 am: fb3b187f10 am: 7abf49d3b7 am: 1684713f2e am: cd6eba50ba
am: 576e4ac184

Change-Id: I304213f41d8b6f499d022f453392234ae901b36c
2019-01-10 16:14:19 -08:00
Android Build Merger (Role)
3c2abaa4da [automerger] Select only preinstalled Spell Checker Services am: ed5973b8a8 am: 5ab7f995ba am: d71a5db522 am: 276e18c147 am: d962aabf4c
Change-Id: I4fa4b56b1472ed6c25bc431ef9ce8060cb04a1f1
2019-01-10 17:55:03 +00:00
Android Build Merger (Role)
d962aabf4c [automerger] Select only preinstalled Spell Checker Services am: ed5973b8a8 am: 5ab7f995ba am: d71a5db522 am: 276e18c147
Change-Id: I2a8463e8e885a81229b28e7e99e7432a08a04c93
2019-01-10 17:54:53 +00:00
Android Build Merger (Role)
276e18c147 [automerger] Select only preinstalled Spell Checker Services am: ed5973b8a8 am: 5ab7f995ba am: d71a5db522
Change-Id: I9e0504f59437cc8fd72e96630a6fb753a4cbb423
2019-01-10 17:54:43 +00:00
Android Build Merger (Role)
d71a5db522 [automerger] Select only preinstalled Spell Checker Services am: ed5973b8a8 am: 5ab7f995ba
Change-Id: I51fbf27831b8b981a7b1a6e2af9cf46d8e544c12
2019-01-10 17:54:29 +00:00
Android Build Merger (Role)
5ab7f995ba [automerger] Select only preinstalled Spell Checker Services am: ed5973b8a8
Change-Id: I8da1dd728ff244a1363d9274aa3f41d1c6081ee8
2019-01-10 17:54:16 +00:00
Guliz Tuncay
ed5973b8a8 Select only preinstalled Spell Checker Services
When we are setting a new spell checker as the default one in
Secure.Settings, TSMS#findAvailSpellCheckerLocked can pick up
any available spell checker service. This violates the principle
that user should be warned whenever we are setting an untrusted
spell checker service as the default service, since the warning
dialog is never shown.

Fixes: 64764051
Bug: 118694079
Test: Manually as follows:
1. Open 'packages/inputmethods/LatinIME/java/AndroidManifest.xml'
     and remove 'AndroidSpellCheckerService'
2. lunch aosp_buillhead-userdebug && make -j
3. Flash the image
4. adb shell dumpsys textservices
    -> no spell checker is recognized
5. adb shell settings get secure selected_spell_checker
    -> null
6. tapas SampleSpellCheckerService
7. make -j
8. adb install -r $OUT/system/app/SampleSpellCheckerService/SampleSpellCheckerService.apk
9. adb shell dumpsys textservices
    -> SampleSpellCheckerService is recognized
10. adb shell settings get secure selected_spell_checker
    -> null

Change-Id: I16f12293d15258c9148677c7ee09fe6dcf81e81d
Merged-In: Idab3ecc246fe9344a09e6907a0ba39f8ea6506f9
2019-01-10 17:54:12 +00:00
Daniel Sandler
b9596e5feb Merge "Harden against invalid paths." into pi-dev 2019-01-10 15:42:31 +00:00
Bryan Ferris
b262dd1b15 Empty commit for automerge manipulation
am: dd8b0a6bc8

Change-Id: I382af531b37c78862d8628ffc20bffef211b1e0d
2019-01-09 16:46:41 -08:00
Android Build Merger (Role)
576e4ac184 [automerger] Revert "Select only preinstalled Spell Checker Services" am: 170e24d4e1 am: fb3b187f10 am: 7abf49d3b7 am: 1684713f2e am: cd6eba50ba
Change-Id: I9b15a7332565cc39eee4abb9faccb2d148281bf0
2019-01-10 00:44:52 +00:00
Android Build Merger (Role)
cd6eba50ba [automerger] Revert "Select only preinstalled Spell Checker Services" am: 170e24d4e1 am: fb3b187f10 am: 7abf49d3b7 am: 1684713f2e
Change-Id: Ib4cbddb955c57d2d59fb3b7fe656e21bc56266aa
2019-01-10 00:44:47 +00:00
Android Build Merger (Role)
1684713f2e [automerger] Revert "Select only preinstalled Spell Checker Services" am: 170e24d4e1 am: fb3b187f10 am: 7abf49d3b7
Change-Id: I019b36991306a8f7887b7a0b8233b2c9f1c9ed32
2019-01-10 00:44:41 +00:00
Android Build Merger (Role)
7abf49d3b7 [automerger] Revert "Select only preinstalled Spell Checker Services" am: 170e24d4e1 am: fb3b187f10
Change-Id: Idfe048ca52ab0eb317e9313f56b884d264c14fd5
2019-01-10 00:44:36 +00:00
Android Build Merger (Role)
fb3b187f10 [automerger] Revert "Select only preinstalled Spell Checker Services" am: 170e24d4e1
Change-Id: I11efc66592aada0a9b54299b6d782e92e247f811
2019-01-10 00:44:29 +00:00
Bryan Ferris
170e24d4e1 Revert "Select only preinstalled Spell Checker Services"
This reverts commit fa265ed970.

Reason for revert: The backport for b/118694079 was applied improperly.

The fix involved filtering the class members list of spell checkers into a new list before searching it. The backport filtered the list but failed to update references to the class member into references to the local variable, creating no change in observable behavior. A new version of this commit will be simultaneously uploaded, which both fixes the bad behavior and allows us to have exactly 1 CL per branch that fixes the issue.

Bug: 118694079

Change-Id: Ic38a2ca2ddede7f0929779b0f2292b7823c11e87
Merged-In: Idab3ecc246fe9344a09e6907a0ba39f8ea6506f9
2019-01-10 00:44:27 +00:00
Bryan Ferris
dd8b0a6bc8 Empty commit for automerge manipulation
The backport for nyc-dev through oc-dev in b/118694079 was improperly
applied. Therefore, we need to apply changes to oc-dev but not
oc-mr1-dev. Since the different CL's had the same Change ID we cannot
use MERGED IN with the original Change ID, and RESTRICT AUTOMERGE
can't stop us from jumping to oc-mr1-dev. This commit gives us a
Change ID that we can use for proper behavior.

Test: No code or configuration changes were made in this CL
Bug: 118694079

Change-Id: Idab3ecc246fe9344a09e6907a0ba39f8ea6506f9
2019-01-10 00:11:10 +00:00
Howard Yen
ec1e90a786 Make sure mCurrentUsbFunctionsRequested flag be updated currectly
There is a situation that getCurrentUsbFunctions callback function will
be invoked before mCurrentUsbFunctionsRequested flag updated, thus, gadget
will be reset during boot completed. Make sure mCurrentUsbFunctionsRequested
flag be updated before getCurrentUsbFunctions callback function invoked.

Bug: 121448199
Test: Verified that gadget reset does not happen
Change-Id: Id8b58d9ccd3f62c976d1292575a06554bef622a4
Merged-In: Id8b58d9ccd3f62c976d1292575a06554bef622a4
Signed-off-by: Howard Yen <howardyen@google.com>
(cherry picked from commit 3b747d3138)
2019-01-09 16:40:06 +08:00
Badhri Jagan Sridharan
c6802aa729 Check for preexisting flag before enabling the gadget
onRegistration callback gets triggered as soon has the
serviceNotification object is registered with registerForNotifications.
The preexisting flag in the callback is set if the gadget hal service dies
and restarts. Use this to differentiate between the onRegistration call
for the registerForNotifications vs actual gadget hal service restart.
Do not reset usb gadget if the onRegistration callback is called as a
result of registerForNotifications. This will overcome the occasional
reset of the usb gadget hence the connection during phone bootup.

Bug: 121448199
Test: Verified that gadget reset does not happen
Change-Id: I3b94e55289bb3a53eb9e083177fd4d54bec5f4da
Merged-In: I3b94e55289bb3a53eb9e083177fd4d54bec5f4da
(cherry picked from commit 222ed0fcf0)
2019-01-09 16:39:58 +08:00
Adrian Roos
ba1deea30d [automerger skipped] Merge "DPM: Fix regression from I54376f60ac53451ace22965d331b47cd8c2e614e" into oc-mr1-dev
am: 79c2376045 -s ours
am skip reason: change_id I3fbc952bd44291ac22728c626b128fc0c1aae232 with SHA1 b122ae9660 is in history

Change-Id: Ia3a1efaabd913847653c2540028bac671a2bec1d
2019-01-08 11:05:53 -08:00
Adrian Roos
79c2376045 Merge "DPM: Fix regression from I54376f60ac53451ace22965d331b47cd8c2e614e" into oc-mr1-dev 2019-01-08 18:45:44 +00:00
TreeHugger Robot
de5026c433 Merge "DPM: Fix regression from I54376f60ac53451ace22965d331b47cd8c2e614e" into pi-dev 2019-01-08 17:32:41 +00:00
Tony Mak
ecb38f300b Merge changes from topic "am-5969704d-c4c1-4e63-afae-e851b95f3e2b" into oc-dev am: 5ee2efb484 am: 340620b4cb
am: 68670c2f77

Change-Id: I24b7efa297ae908de669cb6957071003c037fca4
2019-01-08 04:48:29 -08:00
Tony Mak
68670c2f77 Merge changes from topic "am-5969704d-c4c1-4e63-afae-e851b95f3e2b" into oc-dev am: 5ee2efb484
am: 340620b4cb

Change-Id: I9b544c70edf909ad82edf45207286168e63ffcd6
2019-01-08 04:33:52 -08:00
Tony Mak
340620b4cb Merge changes from topic "am-5969704d-c4c1-4e63-afae-e851b95f3e2b" into oc-dev
am: 5ee2efb484

Change-Id: I03962452c1ff5c3a25ed319e7b32e209f8fab5f4
2019-01-08 04:18:40 -08:00
TreeHugger Robot
5ee2efb484 Merge changes from topic "am-5969704d-c4c1-4e63-afae-e851b95f3e2b" into oc-dev
* changes:
  [automerger] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am: 73f398d306 am: 363e47e676 am: efb165f557 am: b2b98a008b skipped: 3823545fee
  [automerger] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am: 73f398d306 am: 363e47e676 am: efb165f557 am: b2b98a008b
  [automerger] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am: 73f398d306 am: 363e47e676 am: efb165f557
  [automerger] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am: 73f398d306 am: 363e47e676
  [automerger] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am: 73f398d306
  RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters.
2019-01-08 11:55:30 +00:00
Adrian Roos
b122ae9660 DPM: Fix regression from I54376f60ac53451ace22965d331b47cd8c2e614e
Fixes an issue where setting a password via DPM would never
satisfy a QUALITY_COMPLEX password requirement.

Change-Id: I3fbc952bd44291ac22728c626b128fc0c1aae232
Merged-In: I3fbc952bd44291ac22728c626b128fc0c1aae232
Fixes: 120915644
Bug: 110172241
Test: atest 'com.android.cts.devicepolicy.DeviceAdminHostSideTestApi24#testRunDeviceOwnerPasswordTest'
Test: Set credential via DPM.resetPassword(), factory reset device to trigger FRP, verify FRP shows.
(cherry picked from commit ea8d82c08a)
2019-01-08 11:51:13 +00:00
Adrian Roos
48d06522c6 DPM: Fix regression from I54376f60ac53451ace22965d331b47cd8c2e614e
Fixes an issue where setting a password via DPM would never
satisfy a QUALITY_COMPLEX password requirement.

Change-Id: I3fbc952bd44291ac22728c626b128fc0c1aae232
Merged-In: I3fbc952bd44291ac22728c626b128fc0c1aae232
Fixes: 120915644
Bug: 110172241
Test: atest 'com.android.cts.devicepolicy.DeviceAdminHostSideTestApi24#testRunDeviceOwnerPasswordTest'
Test: Set credential via DPM.resetPassword(), factory reset device to trigger FRP, verify FRP shows.
2019-01-08 12:42:39 +01:00
Tony Mak
2e28ea61b6 [automerger skipped] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am: d9e75a497e am: 3f552669e3 -s ours
am: 4c7d37551c -s ours
am skip reason: subject contains skip directive

Change-Id: If9615b7e3e519e0270646ea2d4500f8a14644190
2019-01-08 03:11:12 -08:00
Tony Mak
4c7d37551c [automerger skipped] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am: d9e75a497e
am: 3f552669e3 -s ours
am skip reason: change_id Ib2ee544b5783234fba8ee2f93adf0b36b039520f with SHA1 4e3507d544 is in history

Change-Id: I71dac905e55f732d839549d15700ee6d4db537e7
2019-01-08 03:01:16 -08:00
Tony Mak
3f552669e3 RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters.
am: d9e75a497e

Change-Id: Id1b62f552f29ef9a20d78bb7487201452dfda601
2019-01-08 02:50:57 -08:00
Abodunrinwa Toki
b59effc883 [automerger skipped] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters.
am: 4e3507d544 -s ours
am skip reason: subject contains skip directive

Change-Id: I8415feaa840b6a4c925ec87b4d2e2aed8981037e
2019-01-07 17:23:59 -08:00
Abodunrinwa Toki
4e3507d544 RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters.
Also don't show smart actions for selections in text with unsupported
characters.

Bug: 116321860
Test: runtest -x cts/tests/tests/text/src/android/text/util/cts/LinkifyTest.java
Change-Id: Ib2ee544b5783234fba8ee2f93adf0b36b039520f
2019-01-04 17:30:28 +00:00
Tony Mak
d9e75a497e RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters.
Also don't show smart actions for selections in text with unsupported
characters.

Bug: 116321860
Test: runtest -x cts/tests/tests/text/src/android/text/util/cts/LinkifyTest.java
Change-Id: Ib2ee544b5783234fba8ee2f93adf0b36b039520f
Merged-In: Ib2ee544b5783234fba8ee2f93adf0b36b039520f
2019-01-03 17:10:46 +00:00
Abodunrinwa Toki
a69950ce18 RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters.
Also don't show smart actions for selections in text with unsupported
characters.

Bug: 116321860
Test: atest android.view.textclassifier.TextClassificationManagerTest \
            android.text.util.cts.LinkifyTest \
	    android.text.util.LinkifyTest \
	    android.widget.TextViewActivityTest

Change-Id: I01b5e936aa4dfc937a98f50e9fc8171666861a61
2019-01-03 14:20:30 +00:00