OSDN Git Service
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
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
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
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
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
TreeHugger Robot [Thu, 13 Dec 2018 19:05:13 +0000 (19:05 +0000)]
Merge "FRP: save password quality in DPM.resetPassword" into pi-dev
Andrew Solovay [Thu, 13 Dec 2018 16:58:29 +0000 (16:58 +0000)]
Merge "docs: Fixing malformed @links" into pi-dev
Neil Fuller [Thu, 13 Dec 2018 11:18:23 +0000 (11:18 +0000)]
Merge "Fix translateable -> translatable in .xml files" into pi-dev
TreeHugger Robot [Thu, 13 Dec 2018 04:55:03 +0000 (04:55 +0000)]
Merge "DO NOT MERGE fix some linkproperties configs missing" into pi-dev
Andrew Solovay [Wed, 12 Dec 2018 22:25:47 +0000 (14:25 -0800)]
docs: Fixing malformed @links
Several @link javadoc directives were malformed, resulting in the
Javadoc code being output to the HTML.
Staged to:
http://go/dac-stage/reference/android/app/Activity
http://go/dac-stage/reference/android/app/RemoteInput
http://go/dac-stage/android/os/UserManager
Bug:
120743732
Test: make ds-docs
Change-Id: I2c00c7e1e3adcff696e6d000206aeeaea61e7ecd
Exempt-From-Owner-Approval: Doc-only change
WyattRiley [Thu, 6 Dec 2018 19:43:58 +0000 (11:43 -0800)]
Adding SUPL NI Emergency Extension Time
Configurable by carrier config.xml resource
Bug:
118839234
Bug:
115361555
Bug:
112159033
Test: On device, see b/
115361555#comment14
Change-Id: I52e61656cca8b6fa6468d32d2e69bf60f4c83c61
Merged-In: I52e61656cca8b6fa6468d32d2e69bf60f4c83c61
WyattRiley [Thu, 6 Dec 2018 19:43:58 +0000 (11:43 -0800)]
Adding SUPL NI Emergency Extension Time
Configurable by carrier config.xml resource
Bug:
118839234
Bug:
115361555
Bug:
112159033
Test: On device, see b/
115361555#comment14
Change-Id: I52e61656cca8b6fa6468d32d2e69bf60f4c83c61
Merged-In: I52e61656cca8b6fa6468d32d2e69bf60f4c83c61
TreeHugger Robot [Tue, 11 Dec 2018 21:07:02 +0000 (21:07 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Tue, 11 Dec 2018 11:26:19 +0000 (03:26 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id664673cc59b896616775a43876c87c0692a98a5
markchien [Mon, 10 Dec 2018 12:53:47 +0000 (20:53 +0800)]
DO NOT MERGE fix some linkproperties configs missing
In handleUpdateLinkProperties(), it will always assign newLp
to nai first. Then, the copied newLp would add some configurations
ex: private dns/clatd. This updated newLp wouldn't be assigned back to
nai when linkproperties is not changed.
Bug:
113637648
Test: - build, flash, booted
- atest FrameworksNetTests
- run CtsNetTestCases
Change-Id: I9e25e46718e076d4afa784ee5e1d3abbe0f11911
TreeHugger Robot [Tue, 11 Dec 2018 02:46:38 +0000 (02:46 +0000)]
Merge "Fixed the inline launch animation for notification groups" into pi-dev
WyattRiley [Thu, 6 Dec 2018 19:43:58 +0000 (11:43 -0800)]
Adding SUPL NI Emergency Extension Time
Configurable by carrier config.xml resource
Bug:
118839234
Bug:
115361555
Bug:
112159033
Test: On device, see b/
115361555#comment14
Change-Id: I52e61656cca8b6fa6468d32d2e69bf60f4c83c61
Bill Lin [Mon, 10 Dec 2018 01:52:36 +0000 (01:52 +0000)]
Merge "DO NOT MERGE Implement USB High Temperature warning dialog(1/N)" into pi-dev
fionaxu [Wed, 19 Jul 2017 18:11:54 +0000 (11:11 -0700)]
support vzw roaming default on
1. sms link handling by defaultcarrierapp under restricted NW
2. support launching defaultcarrierapp from carrier notification to
load captive portal page.
3. new carrier action to reset all actions
4. add a new app icon
Bug:
113114222
Test: manual test with cold SIM to trigger redirection signal
Change-Id: Ieb03244f222334068652e2fac8ee590082973670
Adrian Roos [Thu, 6 Dec 2018 16:50:41 +0000 (17:50 +0100)]
FRP: save password quality in DPM.resetPassword
When setting a password from DPM.resetPassword(), the actual quality of the
password was not passed to LockSettingsService (instead, the minimum required
quality was passed which is often UNSPECIFIED). As a result, during FRP we
would see inconsistent state and skip it.
Bug:
110172241
Test: Set credential via DPM.resetPassword(), factory reset device to trigger FRP, verify FRP shows.
Change-Id: I54376f60ac53451ace22965d331b47cd8c2e614e
Merged-In: I54376f60ac53451ace22965d331b47cd8c2e614e
Adrian Roos [Thu, 6 Dec 2018 16:50:41 +0000 (17:50 +0100)]
FRP: save password quality in DPM.resetPassword
When setting a password from DPM.resetPassword(), the actual quality of the
password was not passed to LockSettingsService (instead, the minimum required
quality was passed which is often UNSPECIFIED). As a result, during FRP we
would see inconsistent state and skip it.
Bug:
110172241
Test: Set credential via DPM.resetPassword(), factory reset device to trigger FRP, verify FRP shows.
Change-Id: I54376f60ac53451ace22965d331b47cd8c2e614e
Merged-In: I54376f60ac53451ace22965d331b47cd8c2e614e
Selim Cinek [Sat, 1 Dec 2018 02:06:57 +0000 (18:06 -0800)]
Fixed the inline launch animation for notification groups
When launching a child of a group there would be strange artifacts
from the clipping. These are now fixed. Also made sure that
the notification can't be launched if the parent is translated.
Test: launch child in a group, observe normal animation
Change-Id: Iee8e4b49462e140d3eaffe5b2504caa1b67d04e2
Merged-In: Iee8e4b49462e140d3eaffe5b2504caa1b67d04e2
Fixes:
110093221
Andrew Solovay [Wed, 5 Dec 2018 23:01:26 +0000 (15:01 -0800)]
docs: Javadoc fixes
A summary line failed to end with a period, with catastrophic
results--a table got pulled into the Javadoc summary table, which
broke the whole page's formatting. Putting a period at the end of
the summary line fixed everything.
Also made some other Javadoc fixes while I was in there--some
angle brackets needed to be escaped to display properly.
Doc is staged to:
http://go/dac-stage/reference/android/R.styleable
Bug:
119539013
Test: make ds-docs
Change-Id: If44050d8b03e70e619f0a2588ebc3ab07db7c4f2
Exempt-From-Owner-Approval: Doc-only change
Bill Lin [Tue, 2 Oct 2018 10:10:09 +0000 (18:10 +0800)]
DO NOT MERGE Implement USB High Temperature warning dialog(1/N)
When device USB adapter got electric short issue and overheating.
Popup overheat alarm dialog, with beep sound and vibration(optional)
to notify user unplug USB cable, this dialog will keep showing at
foreground until user click OK button or see care steps.
Test: manual adjust threshold to 35 degrees and trigger alarm
Test: atest SystemUITests
Test: atest PowerUITest
Test: atest PowerNotificationWarningsTest
Test: atest OverheatAlarmControllerTest
Test: atest OverheatAlarmDialogTest
Change-Id: I35e4269b2f3f2108043e2756d0f5a53f54d86e7d
Fix: b/
117138158
Jakub Pawlowski [Fri, 30 Nov 2018 16:42:22 +0000 (08:42 -0800)]
[automerger skipped] Bluetooth: Check descriptors size in BluetoothHidDeviceAppSdpSettings am:
f843ccbf9e am:
0712542a6f
am:
7396f53056 -s ours
Change-Id: Ia5df76548909a33d8e00516246f7024248c232ff
Jakub Pawlowski [Fri, 30 Nov 2018 16:32:04 +0000 (08:32 -0800)]
Bluetooth: Check descriptors size in BluetoothHidDeviceAppSdpSettings am:
f843ccbf9e
am:
0712542a6f
Change-Id: Ia2cd4c36a357350f203aa34c42ee0a7711e18a67
Jakub Pawlowski [Fri, 30 Nov 2018 16:22:48 +0000 (08:22 -0800)]
Bluetooth: Check descriptors size in BluetoothHidDeviceAppSdpSettings
am:
f843ccbf9e
Change-Id: I73800fa61a09d6a5e603582a0a4046a8bb7fd5d8
Jakub Pawlowski [Thu, 29 Nov 2018 17:54:21 +0000 (18:54 +0100)]
Bluetooth: Check descriptors size in BluetoothHidDeviceAppSdpSettings
Bug:
119819889
Test: compilation
Change-Id: If51d0e2af74d99758f79a603d40cc2f5c84e4dde
Merged-In: If51d0e2af74d99758f79a603d40cc2f5c84e4dde
Jakub Pawlowski [Thu, 29 Nov 2018 17:54:21 +0000 (18:54 +0100)]
Bluetooth: Check descriptors size in BluetoothHidDeviceAppSdpSettings
Bug:
119819889
Test: compilation
Change-Id: If51d0e2af74d99758f79a603d40cc2f5c84e4dde
felkachang [Thu, 24 May 2018 07:38:04 +0000 (15:38 +0800)]
DO NOT MERGE Fix the icon overlay after density change
After showing the heads up for the fullscreen notification, to
change the density by user will have the status bar icons
not show normally. It will the only one icon overlay on the
clock but actually there are more than one icons. And, it can't
back to normal after expandable notification and collapse the
notification panel.
The root cause is that all of instances of PhoneStatusBarView,
Clock, HeadsUpStatusBarView, and HeadsUpAppearanceController are
recreated by FragmentManager after configuration density and
font changing. The new HeadsUpAppearanceController status is
neither consistent with HeadsUpManager's status nor the state of
the previous instances.
The solution is that to apply the onSaveInstanceState and
onRestoreInstanceState in PhoneStatusBarView, Clock, PanelBar, and
HeadsUpStatusBarView. To make sure that the values of the fields
in the new instance, which are set by other source, have the
consistence with the state of the old instances.
HeadsUpAppearanceController's Constructor.
To hook onLayoutChangedListener to sync the status with
HeadsUpManager's status to HeadsUpStatusBarView if there is a
pinnded heads up notification.
In original, PanelBar.mState is the only one state to save. Instead
of only saving one, to save the view tree state in
CollapsedStatusBarFragment.onSaveInstanceState and restore the view
state in CollapsedStatusBarFragment.onViewCreated.
CollapsedStatusBarFragment.mDisabled1 doesn't need to save and
restore because CommandQueue.recomputeDisableFlags will give it
the correct value.
After density changed, RemoteViews will reinflate the instances of
NotificationHeaderView and the wrapper instances of
NoticationContentView will also recreated in
NotificationContentView.setAmbientChild. The recreated instance
should synchronized with the ExpandableNotificationRow intance.
Bug:
80224819
Fixes:
111996469
Fixes:
117818441
Test: atest SystemUITests
Change-Id: I08ace5633ae228d329cb6d8881eed2b37704ae8f
Merged-In: I7b92af7c3cf6290ec58ac13bf295f63b0b36332f
Neil Fuller [Fri, 23 Nov 2018 15:09:20 +0000 (15:09 +0000)]
Fix translateable -> translatable in .xml files
Fix translateable -> translatable in .xml files. The attribute
must be correctly named to influence behavior.
Bug:
119884572
Bug:
119941330
Test: build only
Change-Id: I59b17e914f90cab495c1e7be3c14b0423da73b43
(cherry picked from commit
70ffd663aaddce78e1f148999569de5f13995b2e)
Andrew Solovay [Tue, 20 Nov 2018 18:50:17 +0000 (18:50 +0000)]
Merge "docs: Removing @see link to hidden field" into pi-dev
Varun Shah [Mon, 19 Nov 2018 23:25:46 +0000 (15:25 -0800)]
[automerger skipped] Merge "RESTRICT AUTOMERGE: Added an app id security check in isAppForeground." into oc-dev am:
546ba589a2 am:
84376cb95a
am:
abff788177 -s ours
Change-Id: I79b6c04d2aca7543507f064bbe827f8d2ac9340d
Varun Shah [Mon, 19 Nov 2018 23:19:59 +0000 (15:19 -0800)]
Merge "RESTRICT AUTOMERGE: Added an app id security check in isAppForeground." into oc-dev am:
546ba589a2
am:
84376cb95a
Change-Id: I096470de6d03ab34591b12bc7172056a1ffe38ed
Varun Shah [Mon, 19 Nov 2018 23:11:59 +0000 (15:11 -0800)]
Merge "RESTRICT AUTOMERGE: Added an app id security check in isAppForeground." into oc-dev
am:
546ba589a2
Change-Id: I0b63c0bef57320b7465c2fe4e45304fd637e712d
Andrew Solovay [Mon, 19 Nov 2018 21:16:40 +0000 (13:16 -0800)]
docs: Removing @see link to hidden field
Docs had contained a @see link to #FIRST_SDK_INT , but that field
had a @hide directive, so the @see link resulted in an error message
in the output.
Doc staged to:
http://go/dac-stage/reference/android/os/Build.VERSION#SDK_INT
Bug:
80445154
Test: make ds-docs
Change-Id: Id8d461c517bd4d8b3c49b61da37ec0a16768a63d
Exempt-From-Owner-Approval: Doc-only change
TreeHugger Robot [Mon, 19 Nov 2018 22:50:20 +0000 (22:50 +0000)]
Merge "RESTRICT AUTOMERGE: Added an app id security check in isAppForeground." into pi-dev
TreeHugger Robot [Mon, 19 Nov 2018 22:49:58 +0000 (22:49 +0000)]
Merge "RESTRICT AUTOMERGE: Added an app id security check in isAppForeground." into oc-dev
Andrew Solovay [Mon, 19 Nov 2018 17:37:52 +0000 (17:37 +0000)]
Merge "docs: Fixing typos." into pi-dev
Andrew Solovay [Fri, 16 Nov 2018 22:55:13 +0000 (14:55 -0800)]
docs: Fixing typos.
Doc is staged to:
http://go/dac-stage/reference/android/media/audiofx/AudioEffect
http://go/dac-stage/reference/android/media/audiofx/AudioEffect.OnControlStatusChangeListener
http://go/dac-stage/reference/android/media/audiofx/AudioEffect.OnEnableStatusChangeListener
Bug:
119656338
Change-Id: I813610941ae0f317944a75687f354cc9f66e8600
Exempt-From-Owner-Approval: Doc-only change
Test: make ds-docs
Guliz Tuncay [Fri, 16 Nov 2018 22:27:49 +0000 (14:27 -0800)]
[automerger skipped] [automerger] Select only preinstalled Spell Checker Services am:
fa265ed970 am:
c008f3df63 am:
8df481923f am:
6e652225ad am:
6bd38ca2aa am:
608d567e43 am:
e5322fa084 -s ours
am:
3c53f926f3 -s ours
Change-Id: I441d92faa9cfd4b2d748c05236eda6921b677d7c
Guliz Tuncay [Fri, 16 Nov 2018 22:03:29 +0000 (14:03 -0800)]
[automerger skipped] [automerger] Select only preinstalled Spell Checker Services am:
fa265ed970 am:
c008f3df63 am:
8df481923f am:
6e652225ad am:
6bd38ca2aa am:
608d567e43
am:
e5322fa084 -s ours
Change-Id: I42907e9163fc5b58600b2fcd99088f7c49ddbcf0