OSDN Git Service
Makoto Onuki [Thu, 17 Jan 2019 17:56:25 +0000 (17:56 +0000)]
Merge "Don't log account name on logcat (cherry-pick from master)" into pi-dev
TreeHugger Robot [Wed, 16 Jan 2019 09:08:44 +0000 (09:08 +0000)]
Merge "BluetoothManagerService: catch NoSuchElementException for unlinkToDeath" into pi-dev
Makoto Onuki [Tue, 15 Jan 2019 17:34:05 +0000 (09:34 -0800)]
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
TreeHugger Robot [Tue, 15 Jan 2019 22:34:37 +0000 (22:34 +0000)]
Merge "AdapterService: Only bind HeadsetService in ON state." into pi-dev
Julia Reynolds [Tue, 15 Jan 2019 18:02:07 +0000 (18:02 +0000)]
Merge "Actually use listener hints?" into pi-dev
Julia Reynolds [Thu, 3 Jan 2019 19:35:38 +0000 (14:35 -0500)]
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:
db7081e30a6c2d369caeb5b1d26cc00aff788db3
Fixes:
120505040
(cherry picked from commit
db7081e30a6c2d369caeb5b1d26cc00aff788db3)
Howard Yen [Tue, 15 Jan 2019 03:55:00 +0000 (03:55 +0000)]
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
TreeHugger Robot [Tue, 15 Jan 2019 01:10:33 +0000 (01:10 +0000)]
Merge "Fix stuck notifications" into pi-dev
Julia Reynolds [Thu, 13 Sep 2018 19:53:11 +0000 (15:53 -0400)]
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
Bill Yi [Sun, 13 Jan 2019 05:20:57 +0000 (21:20 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I38e9b6203709ba448cccf1ae74f8308c16119f54
TreeHugger Robot [Fri, 11 Jan 2019 03:36:19 +0000 (03:36 +0000)]
Merge "Nullify the default wallpaper component if it does not exist" into pi-dev
Guliz Tuncay [Fri, 11 Jan 2019 01:09:56 +0000 (17:09 -0800)]
[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
Bryan Ferris [Fri, 11 Jan 2019 01:00:34 +0000 (17:00 -0800)]
[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
Guliz Tuncay [Fri, 11 Jan 2019 00:44:22 +0000 (16:44 -0800)]
[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
Bryan Ferris [Fri, 11 Jan 2019 00:36:37 +0000 (16:36 -0800)]
[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
Guliz Tuncay [Fri, 11 Jan 2019 00:21:07 +0000 (16:21 -0800)]
[automerger] Select only preinstalled Spell Checker Services am:
ed5973b8a8 am:
5ab7f995ba am:
d71a5db522 am:
276e18c147 am:
d962aabf4c
am:
3c2abaa4da
Change-Id: I2b4a8618280a602b4eb42db9bf822a14324b587f
Bryan Ferris [Fri, 11 Jan 2019 00:14:19 +0000 (16:14 -0800)]
[automerger] Revert "Select only preinstalled Spell Checker Services" am:
170e24d4e1 am:
fb3b187f10 am:
7abf49d3b7 am:
1684713f2e am:
cd6eba50ba
am:
576e4ac184
Change-Id: I304213f41d8b6f499d022f453392234ae901b36c
Android Build Merger (Role) [Thu, 10 Jan 2019 17:55:03 +0000 (17:55 +0000)]
[automerger] Select only preinstalled Spell Checker Services am:
ed5973b8a8 am:
5ab7f995ba am:
d71a5db522 am:
276e18c147 am:
d962aabf4c
Change-Id: I4fa4b56b1472ed6c25bc431ef9ce8060cb04a1f1
Android Build Merger (Role) [Thu, 10 Jan 2019 17:54:53 +0000 (17:54 +0000)]
[automerger] Select only preinstalled Spell Checker Services am:
ed5973b8a8 am:
5ab7f995ba am:
d71a5db522 am:
276e18c147
Change-Id: I2a8463e8e885a81229b28e7e99e7432a08a04c93
Android Build Merger (Role) [Thu, 10 Jan 2019 17:54:43 +0000 (17:54 +0000)]
[automerger] Select only preinstalled Spell Checker Services am:
ed5973b8a8 am:
5ab7f995ba am:
d71a5db522
Change-Id: I9e0504f59437cc8fd72e96630a6fb753a4cbb423
Android Build Merger (Role) [Thu, 10 Jan 2019 17:54:29 +0000 (17:54 +0000)]
[automerger] Select only preinstalled Spell Checker Services am:
ed5973b8a8 am:
5ab7f995ba
Change-Id: I51fbf27831b8b981a7b1a6e2af9cf46d8e544c12
Android Build Merger (Role) [Thu, 10 Jan 2019 17:54:16 +0000 (17:54 +0000)]
[automerger] Select only preinstalled Spell Checker Services am:
ed5973b8a8
Change-Id: I8da1dd728ff244a1363d9274aa3f41d1c6081ee8
Guliz Tuncay [Wed, 16 Aug 2017 19:02:31 +0000 (12:02 -0700)]
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
Daniel Sandler [Thu, 10 Jan 2019 15:42:31 +0000 (15:42 +0000)]
Merge "Harden against invalid paths." into pi-dev
Bryan Ferris [Thu, 10 Jan 2019 00:46:41 +0000 (16:46 -0800)]
Empty commit for automerge manipulation
am:
dd8b0a6bc8
Change-Id: I382af531b37c78862d8628ffc20bffef211b1e0d
Android Build Merger (Role) [Thu, 10 Jan 2019 00:44:52 +0000 (00:44 +0000)]
[automerger] Revert "Select only preinstalled Spell Checker Services" am:
170e24d4e1 am:
fb3b187f10 am:
7abf49d3b7 am:
1684713f2e am:
cd6eba50ba
Change-Id: I9b15a7332565cc39eee4abb9faccb2d148281bf0
Android Build Merger (Role) [Thu, 10 Jan 2019 00:44:47 +0000 (00:44 +0000)]
[automerger] Revert "Select only preinstalled Spell Checker Services" am:
170e24d4e1 am:
fb3b187f10 am:
7abf49d3b7 am:
1684713f2e
Change-Id: Ib4cbddb955c57d2d59fb3b7fe656e21bc56266aa
Android Build Merger (Role) [Thu, 10 Jan 2019 00:44:41 +0000 (00:44 +0000)]
[automerger] Revert "Select only preinstalled Spell Checker Services" am:
170e24d4e1 am:
fb3b187f10 am:
7abf49d3b7
Change-Id: I019b36991306a8f7887b7a0b8233b2c9f1c9ed32
Android Build Merger (Role) [Thu, 10 Jan 2019 00:44:36 +0000 (00:44 +0000)]
[automerger] Revert "Select only preinstalled Spell Checker Services" am:
170e24d4e1 am:
fb3b187f10
Change-Id: Idfe048ca52ab0eb317e9313f56b884d264c14fd5
Android Build Merger (Role) [Thu, 10 Jan 2019 00:44:29 +0000 (00:44 +0000)]
[automerger] Revert "Select only preinstalled Spell Checker Services" am:
170e24d4e1
Change-Id: I11efc66592aada0a9b54299b6d782e92e247f811
Bryan Ferris [Wed, 9 Jan 2019 23:22:20 +0000 (15:22 -0800)]
Revert "Select only preinstalled Spell Checker Services"
This reverts commit
fa265ed97026e3b8675a2ccbf4035cad6dc1523f.
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
Bryan Ferris [Thu, 10 Jan 2019 00:04:26 +0000 (16:04 -0800)]
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
Howard Yen [Mon, 26 Nov 2018 07:31:47 +0000 (15:31 +0800)]
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
3b747d3138e32903d75b33150c90858ee463d521)
Badhri Jagan Sridharan [Thu, 1 Nov 2018 19:24:20 +0000 (12:24 -0700)]
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
222ed0fcf04cc6bc064a41c60c5f7213cf724127)
Adrian Roos [Tue, 8 Jan 2019 19:05:53 +0000 (11:05 -0800)]
[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
Adrian Roos [Tue, 8 Jan 2019 18:45:44 +0000 (18:45 +0000)]
Merge "DPM: Fix regression from I54376f60ac53451ace22965d331b47cd8c2e614e" into oc-mr1-dev
TreeHugger Robot [Tue, 8 Jan 2019 17:32:41 +0000 (17:32 +0000)]
Merge "DPM: Fix regression from I54376f60ac53451ace22965d331b47cd8c2e614e" into pi-dev
Tony Mak [Tue, 8 Jan 2019 12:48:29 +0000 (04:48 -0800)]
Merge changes from topic "am-
5969704d-c4c1-4e63-afae-
e851b95f3e2b" into oc-dev am:
5ee2efb484 am:
340620b4cb
am:
68670c2f77
Change-Id: I24b7efa297ae908de669cb6957071003c037fca4
Tony Mak [Tue, 8 Jan 2019 12:33:52 +0000 (04:33 -0800)]
Merge changes from topic "am-
5969704d-c4c1-4e63-afae-
e851b95f3e2b" into oc-dev am:
5ee2efb484
am:
340620b4cb
Change-Id: I9b544c70edf909ad82edf45207286168e63ffcd6
Tony Mak [Tue, 8 Jan 2019 12:18:40 +0000 (04:18 -0800)]
Merge changes from topic "am-
5969704d-c4c1-4e63-afae-
e851b95f3e2b" into oc-dev
am:
5ee2efb484
Change-Id: I03962452c1ff5c3a25ed319e7b32e209f8fab5f4
TreeHugger Robot [Tue, 8 Jan 2019 11:55:30 +0000 (11:55 +0000)]
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.
Adrian Roos [Mon, 7 Jan 2019 15:57:31 +0000 (16:57 +0100)]
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
ea8d82c08a9d489a48ef810d7c40a4d20f806aa0)
Adrian Roos [Mon, 7 Jan 2019 15:57:31 +0000 (16:57 +0100)]
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.
Tony Mak [Tue, 8 Jan 2019 11:11:12 +0000 (03:11 -0800)]
[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
Tony Mak [Tue, 8 Jan 2019 11:01:16 +0000 (03:01 -0800)]
[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
Tony Mak [Tue, 8 Jan 2019 10:50:57 +0000 (02:50 -0800)]
RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters.
am:
d9e75a497e
Change-Id: Id1b62f552f29ef9a20d78bb7487201452dfda601
Abodunrinwa Toki [Tue, 8 Jan 2019 01:23:59 +0000 (17:23 -0800)]
[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
Abodunrinwa Toki [Fri, 4 Jan 2019 17:18:39 +0000 (17:18 +0000)]
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
Tony Mak [Thu, 29 Nov 2018 17:37:42 +0000 (17:37 +0000)]
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
Abodunrinwa Toki [Thu, 29 Nov 2018 13:51:56 +0000 (13:51 +0000)]
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
Android Build Merger (Role) [Thu, 3 Jan 2019 14:08:07 +0000 (14:08 +0000)]
[automerger] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am:
73f398d306 am:
363e47e676 am:
efb165f557 am:
b2b98a008b skipped:
3823545fee
Change-Id: I3c673c0d4337914308f5cdd1081e564f96cc3383
Android Build Merger (Role) [Thu, 3 Jan 2019 14:07:59 +0000 (14:07 +0000)]
[automerger] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am:
73f398d306 am:
363e47e676 am:
efb165f557 am:
b2b98a008b
Change-Id: I29c3f97af12987c8a1dd8a69529641d32d2dd172
Android Build Merger (Role) [Thu, 3 Jan 2019 14:07:52 +0000 (14:07 +0000)]
[automerger] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am:
73f398d306 am:
363e47e676 am:
efb165f557
Change-Id: Ibc588da08fbb6069989c7c97110e4cecea0b0ce5
Android Build Merger (Role) [Thu, 3 Jan 2019 14:07:43 +0000 (14:07 +0000)]
[automerger] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am:
73f398d306 am:
363e47e676
Change-Id: I828e0c99ab41935d20033c970b5131f2fcbf9085
Android Build Merger (Role) [Thu, 3 Jan 2019 14:07:33 +0000 (14:07 +0000)]
[automerger] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am:
73f398d306
Change-Id: I423ddd8df74bee8dbf7cd96009bbdffebf81b93a
Tony Mak [Thu, 29 Nov 2018 17:37:42 +0000 (17:37 +0000)]
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: Id271cab8aef6b9b13ef17f1a8654c7616f75cf13
TreeHugger Robot [Thu, 3 Jan 2019 01:48:09 +0000 (01:48 +0000)]
Merge "WebView: no bars in javadoc" into pi-dev
Dan Sandler [Thu, 13 Dec 2018 20:32:13 +0000 (15:32 -0500)]
Harden against invalid paths.
Don't write them, and also, catch runtime exceptions during
persist operations.
Bug:
120749813
Test: atest frameworks/base/services/tests/uiservicestests/src/com/android/server/slice/SlicePermissionManagerTest.java
Change-Id: Ie478814abf5b44e48c8179bee79578e90f4fe3d4
(cherry picked from commit
2d8e3d17f6a2f38b83da6a1b05246dde4e77cb59)
TreeHugger Robot [Sat, 29 Dec 2018 17:28:25 +0000 (17:28 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Sat, 29 Dec 2018 12:33:25 +0000 (04:33 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ief86b2137c84cf76b5dab0bb1cf8a6058b1ba0c1
Bill Yi [Fri, 28 Dec 2018 20:01:33 +0000 (12:01 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I30c1c269156c67d0f005625e3a54740bbed042d4
Nate Fischer [Wed, 26 Dec 2018 23:36:35 +0000 (15:36 -0800)]
WebView: no bars in javadoc
No change to logic, only docs change.
The bar/pipe symbols have no meaning in javadoc. We should mark this
with {@code} instead.
Bug:
122046530
Test: None
Change-Id: I594480ea3bf4fec9c87a48275364c7c616a0e3ea
jonerlin [Thu, 9 Aug 2018 08:39:43 +0000 (16:39 +0800)]
AdapterService: Only bind HeadsetService in ON state.
* there will be an endless loop to call doBind and cause many connectionRecords of HeadsetService while binding HeadsetService in BLE_ON state.
* allow to bind HeadsetService only when BT state is ON
Bug:
111730478
Bug:
121024323
Test: Keep device in BLE_ON state -> kill com.android.phone process
-> As time goes on, adb shell dumpsys activity services to check the connectionRecords of HeadsetService will not become more and more
Change-Id: I5f66d015b8aa3c94c7e887ef033213af74235b4a
TreeHugger Robot [Wed, 26 Dec 2018 05:17:26 +0000 (05:17 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 26 Dec 2018 04:30:21 +0000 (04:30 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 26 Dec 2018 04:17:20 +0000 (04:17 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 26 Dec 2018 04:15:29 +0000 (04:15 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 26 Dec 2018 04:13:19 +0000 (04:13 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 26 Dec 2018 04:12:31 +0000 (04:12 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 26 Dec 2018 04:12:13 +0000 (04:12 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Tue, 25 Dec 2018 17:22:37 +0000 (09:22 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I3e5c13ccfdc6fe9ab0da37f0d971a388ee9dbd49
Bill Yi [Tue, 25 Dec 2018 13:17:25 +0000 (05:17 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ie7e021376ab58e142d22b16570fc324a7dabb2ef
Bill Yi [Tue, 25 Dec 2018 12:46:34 +0000 (04:46 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I7f2b7b65e17667b47392c69c67075ddf7760480f
Bill Yi [Tue, 25 Dec 2018 06:43:20 +0000 (22:43 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I3ba2fd353b08ff74412b7f27eb4357c22d814117
Bill Yi [Tue, 25 Dec 2018 04:43:10 +0000 (20:43 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I3fbde7282f124a98f71a5409a7f1a75f2556b997
Bill Yi [Tue, 25 Dec 2018 04:12:04 +0000 (20:12 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I57636cef08c137b1ccae957d25e29d025b8e41f2
Bill Yi [Tue, 25 Dec 2018 03:40:55 +0000 (19:40 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I8c01308ecbb424632757e2ca5b3160cda815543a
Bill Yi [Mon, 24 Dec 2018 06:16:25 +0000 (22:16 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ide710163d236fdd0f2abd7d88b7c2d9ed137ae8e
Brad Ebinger [Fri, 21 Dec 2018 05:11:44 +0000 (21:11 -0800)]
Improves PIN/PUK handling events in keyguard
1) Remove old bypass code for ABSENT in KeyguardPin/Puk class
and move it into KeyguardViewMediator where it belongs.
2) Fix issue where pulling out sim and then putting it back in
doesnt trigger PIN/PUK screen until turn off->on screen by clearing
SimData state for the slot that became ABSENT.
Bug:
119560495
Test: Move across eSIM and pSIM as well as manually remove PIN/PUK'ed SIMs
Merged-In: Iebf2cb046b1a1d7e0689a2329a9f78e1cbb6aca4
Change-Id: Iebf2cb046b1a1d7e0689a2329a9f78e1cbb6aca4
Lucas Dupin [Tue, 18 Sep 2018 00:17:14 +0000 (17:17 -0700)]
Cherry-picked "Hide bouncer after unlocking SIM card" to pi-dev
We don't want to hide the bouncer when the SIM card is READY,
unless we were already at the bouncer because of the SIM PIN/PUK
Test: Insert locked SIM card on lock screen or launcher. Type PIN
Test: Insert unlocked SIM card after pulling up the bouncer
Bug:
114740965,
120011429
Merged-In: I4f781b47c1e2a12e5c6f064f303cd457ece01b67
Change-Id: I4f781b47c1e2a12e5c6f064f303cd457ece01b67
Lucas Dupin [Thu, 6 Dec 2018 04:03:53 +0000 (20:03 -0800)]
Cherry-picked "Hide SIM PIN when SIM card is removed" to pi-dev
Bug:
120011429
Test: manually add and remove SIM card
Merged-In: Ied7666c2f6c1febe5690e4531b76b58a4f703d86
Change-Id: Ied7666c2f6c1febe5690e4531b76b58a4f703d86
WyattRiley [Fri, 21 Dec 2018 19:35:54 +0000 (11:35 -0800)]
[automerger skipped] [automerger] Adding SUPL NI Emergency Extension Time am:
64306e1e7b am:
882e4e7ba0 am:
478d13d664 am:
17232346f0 skipped:
46f972fea5 am:
5cf98f1399 -s ours am:
5420e91d1e -s ours
am:
9d93bdb61a -s ours
Change-Id: I31477caf17978a9825675ded101f02abef3fc88a
WyattRiley [Fri, 21 Dec 2018 19:17:41 +0000 (11:17 -0800)]
[automerger skipped] [automerger] Adding SUPL NI Emergency Extension Time am:
64306e1e7b am:
882e4e7ba0 am:
478d13d664 am:
17232346f0 skipped:
46f972fea5 am:
5cf98f1399 -s ours
am:
5420e91d1e -s ours
Change-Id: I9ca3e797b1efe6c41e3dd958dd2657a467f690f7
WyattRiley [Fri, 21 Dec 2018 19:07:09 +0000 (11:07 -0800)]
[automerger skipped] [automerger] Adding SUPL NI Emergency Extension Time am:
64306e1e7b am:
882e4e7ba0 am:
478d13d664 am:
17232346f0 skipped:
46f972fea5
am:
5cf98f1399 -s ours
Change-Id: Ic83aa8cd0eb564e27264dfb3f929bc86fe7ec4f6
Android Build Merger (Role) [Fri, 21 Dec 2018 16:50:53 +0000 (16:50 +0000)]
[automerger] Adding SUPL NI Emergency Extension Time am:
64306e1e7b am:
882e4e7ba0 am:
478d13d664 am:
17232346f0 skipped:
46f972fea5
Change-Id: I93997d7383990bd70492944411196c8fbb6b319e
Android Build Merger (Role) [Fri, 21 Dec 2018 16:49:09 +0000 (16:49 +0000)]
[automerger] Adding SUPL NI Emergency Extension Time am:
64306e1e7b am:
882e4e7ba0 am:
478d13d664 am:
17232346f0
Change-Id: I896fbc8000b44041f54f7e314eb1b970c4644389
Android Build Merger (Role) [Fri, 21 Dec 2018 16:49:03 +0000 (16:49 +0000)]
[automerger] Adding SUPL NI Emergency Extension Time am:
64306e1e7b am:
882e4e7ba0 am:
478d13d664
Change-Id: Ifd8d821683c3c61e2a0e10ac4ce0c24e74e06282
Android Build Merger (Role) [Fri, 21 Dec 2018 16:48:57 +0000 (16:48 +0000)]
[automerger] Adding SUPL NI Emergency Extension Time am:
64306e1e7b am:
882e4e7ba0
Change-Id: I2bb3f878634f4ab80f400fccbd4d1fe6610e5a82
Android Build Merger (Role) [Fri, 21 Dec 2018 16:48:50 +0000 (16:48 +0000)]
[automerger] Adding SUPL NI Emergency Extension Time am:
64306e1e7b
Change-Id: I944dc076c63ba9fd5101bc0366a342e057a13d47
SzuWei Lin [Thu, 22 Nov 2018 06:33:01 +0000 (14:33 +0800)]
Nullify the default wallpaper component if it does not exist
The default wallpaper component cannot be found after GSI is flashed.
The home screen background will have no wallpaper and be black.
It will also cause the following CTS tests to fail:
- KeyguardTests#testDialogShowWhenLockedActivity
- KeyguardTests#testTranslucentShowWhenLockedActivity
The patch will check if the package of the default component exists.
If not, it will fall back to null, which is the AOSP default value, and
display the wallpaper in framework resource.
Bug:
119895131
Bug:
111909699
Test: flash GSI aosp_arm64-userdebug on a crosshatch, got AOSP wallpaper
Test: flash full crosshatch-userdebug on a crosshatch, got crosshatch wallpaper
Change-Id: I9d618d05458a03a675324cb2f861decf31c5bf18
Merged-In: I9d618d05458a03a675324cb2f861decf31c5bf18
(cherry picked from commit
1c7ae31e97f0d90b16dcbefff9c436601cba7007)
WyattRiley [Fri, 21 Dec 2018 01:41:58 +0000 (17:41 -0800)]
[automerger skipped] Adding SUPL NI Emergency Extension Time am:
1cd7883a76 am:
75c5850b4c
am:
15a70cf7ab -s ours
Change-Id: I5e391b8b88cffc272c43dfed2247c0bbc06219e2
WyattRiley [Fri, 21 Dec 2018 01:31:48 +0000 (17:31 -0800)]
Adding SUPL NI Emergency Extension Time am:
1cd7883a76
am:
75c5850b4c
Change-Id: I8a8d54e909fcf43f3ce421b5f893337251544e75
WyattRiley [Fri, 21 Dec 2018 01:23:22 +0000 (17:23 -0800)]
Adding SUPL NI Emergency Extension Time
am:
1cd7883a76
Change-Id: I22286211589cbcc8739c5dfed3a839bada35646a
TreeHugger Robot [Thu, 20 Dec 2018 19:25:27 +0000 (19:25 +0000)]
Merge "Adding SUPL NI Emergency Extension Time" into pi-dev
TreeHugger Robot [Mon, 17 Dec 2018 17:21:38 +0000 (17:21 +0000)]
Merge "Clarify WebResourceResponse parameter documentation." into pi-dev
Chienyuan [Mon, 17 Dec 2018 13:31:40 +0000 (21:31 +0800)]
BluetoothManagerService: catch NoSuchElementException for unlinkToDeath
linkToDeath fail will cause NoSuchElementException when following
unlinkToDeath, add try catch to handle it.
Bug:
121104808
Test: build pass
Change-Id: I2f3337ad417567ea3b4dea3eb004c60f96527c41
Torne (Richard Coles) [Wed, 12 Dec 2018 16:11:33 +0000 (11:11 -0500)]
Clarify WebResourceResponse parameter documentation.
Developers commonly misuse the mimeType and encoding parameters in the
WebResourceResponse constructor as the meaning is different to the
similarly named HTTP headers. Explain more carefully what valid/invalid
inputs look like and mention that this is different to HTTP.
Change-Id: I14d159bc50c89c2215f7de5f4732569e5e246930
Fixes:
64765685
Test: m offline-sdk-docs
Andrew Solovay [Wed, 12 Dec 2018 23:38:06 +0000 (15:38 -0800)]
docs: Fixing malformed javadoc
Several @link & @see javadoc directives were malformed, resulting in the
Javadoc code being output to the HTML.
Staged to:
http://go/dac-stage/reference/android/app/slice/Slice.Builder
http://go/dac-stage/reference/android/app/slice/SliceProvider
http://go/dac-stage/reference/android/text/style/ImageSpan
http://go/dac-stage/reference/android/content/ContentProvider
Bug:
120743732
Test: make ds-docs
Change-Id: I589644f8d266a116441409fbdaf7a0c533e0e356
Merged-In: I589644f8d266a116441409fbdaf7a0c533e0e356
Exempt-From-Owner-Approval: Doc-only change
Meng Wang [Thu, 13 Dec 2018 22:09:51 +0000 (22:09 +0000)]
Merge "support vzw roaming default on" into pi-dev
Adrian Roos [Thu, 13 Dec 2018 19:29:52 +0000 (11:29 -0800)]
[automerger skipped] FRP: save password quality in DPM.resetPassword
am:
ef116def7c -s ours
Change-Id: I35033e0cc15c4e5cbebc5923afb6a113d78617af