OSDN Git Service
Jared Henderson [Wed, 11 Sep 2019 16:27:55 +0000 (09:27 -0700)]
Merge "Update Xbox BT controller mapping for new FW" into qt-dev
am:
1f978f5a8f
Change-Id: I0eb40c78586f0593615fe6f0ab3e7c985c563fbf
TreeHugger Robot [Wed, 11 Sep 2019 16:14:10 +0000 (16:14 +0000)]
Merge "Update Xbox BT controller mapping for new FW" into qt-dev
Jared Henderson [Wed, 21 Aug 2019 22:37:59 +0000 (15:37 -0700)]
Update Xbox BT controller mapping for new FW
The Xbox controller (product id 0x02fd) is going to have a new firmware
update this fall that sends a different keycode (316/BUTTON_MODE) for
the Xbox button. The goal is to enable the Xbox button to make it to
apps on all Android versions -- with our without a controller-specific
key mapping file.
Unfortunately, the new Vendor_045e_Product_02fd.kl key mapping file
that was added to Android Q maps the pre-firmware-update
Xbox key code (172) to BUTTON_MODE, yet it makes no mention of key 316.
This results in apps getting a raw 316 scan code instead of
a BUTTON_MODE KeyEvent when using a controller with the latest firmware
on Android Q.
The fix is to add an additional key mapping for 316 that *also* maps to
BUTTON_MODE. With both mappings in place, both pre and post
firmware-updated controllers will get the correct behavior for the
Xbox button on Android Q.
Test: AFAIK, no CTS tests exist for Xbox controller key mappings;
we'll need to add some at a later date. I was unable to test this
change because I'm unable to write to the system directory on any
of my devices, but I know that mapping 316 to BUTTON_MODE will
fix the issue.
Signed-off-by: Jared Henderson <jaredh.microsoft@gmail.com>
Bug:
139512030
Bug:
140808513
Merged-In: I8600ea79a0aa8557267d6ca712e5d56680e7a98b
Change-Id: I8600ea79a0aa8557267d6ca712e5d56680e7a98b
Varun Shah [Wed, 11 Sep 2019 06:29:10 +0000 (23:29 -0700)]
Merge "Use language tags to store Configuration's locale list." into qt-dev
am:
6dfa267f91
Change-Id: Ia7f30abab7396bc36eb2d69990129143601b028b
TreeHugger Robot [Wed, 11 Sep 2019 06:05:23 +0000 (06:05 +0000)]
Merge "Use language tags to store Configuration's locale list." into qt-dev
Zongheng Wang [Wed, 11 Sep 2019 02:07:08 +0000 (19:07 -0700)]
[automerger skipped] Set default phonebook access to ACCESS_REJECTED when user didn't choose one am:
1f9309bd11 am:
a376239229 -s ours am:
aee078eae7 -s ours am:
870474af0c -s ours
am:
69561082c5 -s ours
am skip reason: change_id Iefabeb731b941f09fe1272ac7b7cd2feba75c8df with SHA1
9b3cb0f06b is in history
Change-Id: I7a11006386d200b0da8eb0e3b27741e1efedb473
Zongheng Wang [Wed, 11 Sep 2019 01:55:09 +0000 (18:55 -0700)]
[automerger skipped] Set default phonebook access to ACCESS_REJECTED when user didn't choose one am:
1f9309bd11 am:
a376239229 -s ours am:
aee078eae7 -s ours
am:
870474af0c -s ours
am skip reason: change_id Iefabeb731b941f09fe1272ac7b7cd2feba75c8df with SHA1
9b3cb0f06b is in history
Change-Id: I5c210241a714fc4064e8f83cc35e77315616337e
Zongheng Wang [Wed, 11 Sep 2019 01:41:23 +0000 (18:41 -0700)]
[automerger skipped] Set default phonebook access to ACCESS_REJECTED when user didn't choose one am:
1f9309bd11 am:
a376239229 -s ours
am:
aee078eae7 -s ours
am skip reason: change_id Iefabeb731b941f09fe1272ac7b7cd2feba75c8df with SHA1
9b3cb0f06b is in history
Change-Id: Ifb20decfdf6a48b599931f87a733e97013538888
Zongheng Wang [Wed, 11 Sep 2019 01:40:02 +0000 (18:40 -0700)]
[automerger skipped] Set default phonebook access to ACCESS_REJECTED when user didn't choose one am:
02046b4f2c -s ours am:
a6c49f091d -s ours
am:
8a7c7cf04c -s ours
am skip reason: change_id Iefabeb731b941f09fe1272ac7b7cd2feba75c8df with SHA1
9b3cb0f06b is in history
Change-Id: I2a6ea0a79ee30b3f40597b25ea9d4e936d24147a
Zongheng Wang [Wed, 11 Sep 2019 01:30:59 +0000 (18:30 -0700)]
[automerger skipped] Set default phonebook access to ACCESS_REJECTED when user didn't choose one am:
02046b4f2c -s ours
am:
a6c49f091d -s ours
am skip reason: change_id Iefabeb731b941f09fe1272ac7b7cd2feba75c8df with SHA1
9b3cb0f06b is in history
Change-Id: Iebe662b90075b9fcc0fdeabcd6424b84355b05fb
Zongheng Wang [Wed, 11 Sep 2019 01:30:55 +0000 (18:30 -0700)]
[automerger skipped] Set default phonebook access to ACCESS_REJECTED when user didn't choose one am:
1f9309bd11
am:
a376239229 -s ours
am skip reason: change_id Iefabeb731b941f09fe1272ac7b7cd2feba75c8df with SHA1
02046b4f2c is in history
Change-Id: I3cc4d873250f924af768b37e97338024ee236e6e
Zongheng Wang [Wed, 11 Sep 2019 01:27:14 +0000 (18:27 -0700)]
[automerger skipped] Merge "Set default phonebook access to ACCESS_REJECTED when user didn't choose one" into pi-dev am:
20d46e4bf1 -s ours
am:
a36fc3bb2c -s ours
am skip reason: change_id Iefabeb731b941f09fe1272ac7b7cd2feba75c8df with SHA1
efdcff2452 is in history
Change-Id: Ifdfc5a0d8f73cbd1338b53651cf8d293a2625726
Zongheng Wang [Wed, 11 Sep 2019 01:21:53 +0000 (18:21 -0700)]
[automerger skipped] Merge "Set default phonebook access to ACCESS_REJECTED when user didn't choose one" into pi-dev
am:
20d46e4bf1 -s ours
am skip reason: change_id Iefabeb731b941f09fe1272ac7b7cd2feba75c8df with SHA1
efdcff2452 is in history
Change-Id: I695edafa45fc296fff1b84d786c8a804f5996934
Zongheng Wang [Wed, 11 Sep 2019 01:20:49 +0000 (18:20 -0700)]
[automerger skipped] Set default phonebook access to ACCESS_REJECTED when user didn't choose one
am:
02046b4f2c -s ours
am skip reason: change_id Iefabeb731b941f09fe1272ac7b7cd2feba75c8df with SHA1
9b3cb0f06b is in history
Change-Id: I6003b908b417a8bb1d687b5eafe2f2646f63e814
Zongheng Wang [Wed, 11 Sep 2019 01:16:49 +0000 (18:16 -0700)]
Set default phonebook access to ACCESS_REJECTED when user didn't choose one
am:
1f9309bd11
Change-Id: I142d2737f6444b5148963c1ca7af84e8cf0eded3
Zongheng Wang [Wed, 11 Sep 2019 01:15:58 +0000 (18:15 -0700)]
Merge "Set default phonebook access to ACCESS_REJECTED when user didn't choose one" into qt-dev
am:
4e4b2875d5
Change-Id: I370cf06dd4cf268663a062b0b0d7cd4dea6dd0e2
TreeHugger Robot [Wed, 11 Sep 2019 00:46:54 +0000 (00:46 +0000)]
Merge "Set default phonebook access to ACCESS_REJECTED when user didn't choose one" into pi-dev
TreeHugger Robot [Wed, 11 Sep 2019 00:46:08 +0000 (00:46 +0000)]
Merge "Set default phonebook access to ACCESS_REJECTED when user didn't choose one" into qt-dev
Varun Shah [Tue, 10 Sep 2019 18:41:00 +0000 (14:41 -0400)]
Use language tags to store Configuration's locale list.
Instead of storing each Locale within a Configuration object's locale
list by its language, country, variant, and script to proto, store the
entire locale list by its language tags representation which accurately
describes each locale.
Bug:
140197723
Test: atest ConfigurationTest
Test: atest UsageStatsDatabaseTest
Test: manually with bad data
Merged-In: I53946ed4e31de0ffe9c84875c391a7dec6f5375a
Change-Id: Idaae690f79a5c680ad0059a52be62160d9dfb5e7
Colin Cross [Tue, 10 Sep 2019 19:29:07 +0000 (12:29 -0700)]
Merge "Revert "Use language tags to store Configuration's locale list."" into qt-dev
am:
dd67a548b2
Change-Id: I0aaee5386c85bf33b292cfa9241c3a0c62dedd29
Colin Cross [Tue, 10 Sep 2019 19:18:48 +0000 (19:18 +0000)]
Merge "Revert "Use language tags to store Configuration's locale list."" into qt-dev
Varun Shah [Tue, 10 Sep 2019 18:30:47 +0000 (18:30 +0000)]
Revert "Use language tags to store Configuration's locale list."
This reverts commit
ff43f4e6a62bf04742bdcb205ba932de00e4da7c.
Reason for revert: b/
140813780
Change-Id: Id5988b9ec959ca9b294f6bd5caa30c8156238d0a
Varun Shah [Tue, 10 Sep 2019 17:10:25 +0000 (10:10 -0700)]
Merge "Use language tags to store Configuration's locale list." into qt-dev
am:
bdfd7d6adb
Change-Id: I2ed88e4ce5bd3a00cc9ea951815c17c57a6599a2
Varun Shah [Tue, 10 Sep 2019 17:10:20 +0000 (10:10 -0700)]
Fix bootloop issue with UsageStatsService.
am:
669d886cdc
Change-Id: Iab6f4086aa2bd2b5709f499b85ce79359cd76829
Varun Shah [Tue, 10 Sep 2019 16:51:37 +0000 (16:51 +0000)]
Merge "Use language tags to store Configuration's locale list." into qt-dev
Zongheng Wang [Thu, 5 Sep 2019 20:44:28 +0000 (13:44 -0700)]
Set default phonebook access to ACCESS_REJECTED when user didn't choose
one
When there's no users' choice to tell us whether to share their
phonebook information to the Bluetooth device, set the phonebook access
permission to ACCESS_REJECTED.
Bug:
138529441
Test: Manual test
Change-Id: Iefabeb731b941f09fe1272ac7b7cd2feba75c8df
Merged-In: Iefabeb731b941f09fe1272ac7b7cd2feba75c8df
Varun Shah [Sun, 8 Sep 2019 08:31:31 +0000 (01:31 -0700)]
Use language tags to store Configuration's locale list.
Instead of storing each Locale within a Configuration object's locale
list by its language, country, variant, and script to proto, store the
entire locale list by its language tags representation which accurately
describes each locale.
Bug:
140197723
Test: atest ConfigurationTest
Test: atest UsageStatsDatabaseTest
Test: manually with bad data
Change-Id: Id0e63ae4a7be578d1e93838b371320f86a787e0e
Zongheng Wang [Thu, 5 Sep 2019 20:44:28 +0000 (13:44 -0700)]
Set default phonebook access to ACCESS_REJECTED when user didn't choose
one
When there's no users' choice to tell us whether to share their
phonebook information to the Bluetooth device, set the phonebook access
permission to ACCESS_REJECTED.
Bug:
138529441
Test: Manual test
Change-Id: Iefabeb731b941f09fe1272ac7b7cd2feba75c8df
Merged-In: Iefabeb731b941f09fe1272ac7b7cd2feba75c8df
Varun Shah [Wed, 4 Sep 2019 19:04:02 +0000 (12:04 -0700)]
Fix bootloop issue with UsageStatsService.
When the configurations are being read from the proto file, if a
duplicate locale is found in the list, an exception is thrown from
LocaleList which causes the UsageStatsService to crash. Instead, we'll
now log a WTF if duplicate locales are found when parsing the
configuration proto and not add the duplicate locale to the list.
Bug:
140197723
Test: atest UsageStatsDatabaseTest
Change-Id: Ie178b3cfdd45e6771a7c0e4bb42e47f79b5c30cc
(cherry picked from commit
5d9031dbee2fad9b29e6477f5d7af8b622f2b456)
Zongheng Wang [Thu, 5 Sep 2019 20:44:28 +0000 (13:44 -0700)]
Set default phonebook access to ACCESS_REJECTED when user didn't choose
one
When there's no users' choice to tell us whether to share their
phonebook information to the Bluetooth device, set the phonebook access
permission to ACCESS_REJECTED.
Bug:
138529441
Test: Manual test
Change-Id: Iefabeb731b941f09fe1272ac7b7cd2feba75c8df
Merged-In: Iefabeb731b941f09fe1272ac7b7cd2feba75c8df
Zongheng Wang [Thu, 5 Sep 2019 20:44:28 +0000 (13:44 -0700)]
Set default phonebook access to ACCESS_REJECTED when user didn't choose
one
When there's no users' choice to tell us whether to share their
phonebook information to the Bluetooth device, set the phonebook access
permission to ACCESS_REJECTED.
Bug:
138529441
Test: Manual test
Change-Id: Iefabeb731b941f09fe1272ac7b7cd2feba75c8df
Merged-In: Iefabeb731b941f09fe1272ac7b7cd2feba75c8df
(cherry picked from commit
810c6d2117aeec7ca749e707b2e3a297eb8a265e)
Jonathan Scott [Mon, 9 Sep 2019 20:25:25 +0000 (13:25 -0700)]
[automerger skipped] [automerger] Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc). am:
20e5d92613 am:
c1ec4d6e8e am:
80e1c4fd36 am:
7b6a04fceb am:
743846742d am:
0b1d526f50 am:
e4ddc22035 am:
5f619835ed am:
a6ce09aaec -s ours
am:
81e2e1f105 -s ours
am skip reason: change_id I2bce277ff8f2de4614e19d5385fe6712b076f9c9 with SHA1
a5e4422d14 is in history
Change-Id: I0cff860765798db98867e14c2fde35807fc7e299
Jonathan Scott [Mon, 9 Sep 2019 20:09:27 +0000 (13:09 -0700)]
[automerger skipped] [automerger] Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc). am:
20e5d92613 am:
c1ec4d6e8e am:
80e1c4fd36 am:
7b6a04fceb am:
743846742d am:
0b1d526f50 am:
e4ddc22035 am:
5f619835ed
am:
a6ce09aaec -s ours
am skip reason: change_id I2bce277ff8f2de4614e19d5385fe6712b076f9c9 with SHA1
a5e4422d14 is in history
Change-Id: I8b70e43d7ef03f0f86c75270508a6757d90c8561
Jonathan Scott [Mon, 9 Sep 2019 19:50:26 +0000 (12:50 -0700)]
[automerger] Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc). am:
20e5d92613 am:
c1ec4d6e8e am:
80e1c4fd36 am:
7b6a04fceb am:
743846742d am:
0b1d526f50 am:
e4ddc22035
am:
5f619835ed
Change-Id: Ie2c9fb05e3245f3045f3c9a4919760e70285fa37
Jonathan Scott [Mon, 9 Sep 2019 19:35:53 +0000 (12:35 -0700)]
[automerger] Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc). am:
20e5d92613 am:
c1ec4d6e8e am:
80e1c4fd36 am:
7b6a04fceb am:
743846742d am:
0b1d526f50
am:
e4ddc22035
Change-Id: I4084d344b3c92b5a4459852837e323f44d2b0b72
Jonathan Scott [Mon, 9 Sep 2019 19:20:54 +0000 (12:20 -0700)]
[automerger] Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc). am:
20e5d92613 am:
c1ec4d6e8e am:
80e1c4fd36 am:
7b6a04fceb am:
743846742d
am:
0b1d526f50
Change-Id: Ie3f10bbed4bdb2bb7e141d7bb8d34e0b818c3f30
Android Build Merger (Role) [Mon, 9 Sep 2019 16:55:54 +0000 (16:55 +0000)]
[automerger] Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc). am:
20e5d92613 am:
c1ec4d6e8e am:
80e1c4fd36 am:
7b6a04fceb am:
743846742d
Change-Id: Ia84a02b1b3ff3e9f4849554c6b2f0e904daadd05
Android Build Merger (Role) [Mon, 9 Sep 2019 16:55:50 +0000 (16:55 +0000)]
[automerger] Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc). am:
20e5d92613 am:
c1ec4d6e8e am:
80e1c4fd36 am:
7b6a04fceb
Change-Id: I8914a6337a6e6c905b42cc498f34db5142db7a1a
Android Build Merger (Role) [Mon, 9 Sep 2019 16:55:45 +0000 (16:55 +0000)]
[automerger] Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc). am:
20e5d92613 am:
c1ec4d6e8e am:
80e1c4fd36
Change-Id: I6ef1648f805c48ef37c8921ddfa1d147a8e5e032
Android Build Merger (Role) [Mon, 9 Sep 2019 16:55:42 +0000 (16:55 +0000)]
[automerger] Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc). am:
20e5d92613 am:
c1ec4d6e8e
Change-Id: I641d14a61338365b5da7f6c55ead2baff29e811c
Android Build Merger (Role) [Mon, 9 Sep 2019 16:55:35 +0000 (16:55 +0000)]
[automerger] Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc). am:
20e5d92613
Change-Id: I6b5ad877382a352cb5b4bcdd05a2d19da502945a
Jonathan Scott [Fri, 6 Sep 2019 11:44:06 +0000 (04:44 -0700)]
Merge "Add MANAGED_PROVISIONING_DPC_DOWNLOADED." into qt-dev
am:
b01fe73ed3
Change-Id: Idd7424cf00a3c5d8d41e3e051d78d0ac4d6c4a19
Jonathan Scott [Fri, 6 Sep 2019 11:20:56 +0000 (11:20 +0000)]
Merge "Add MANAGED_PROVISIONING_DPC_DOWNLOADED." into qt-dev
Pinyao Ting [Thu, 5 Sep 2019 19:29:24 +0000 (12:29 -0700)]
[automerger skipped] fixes a security vulnerability in slice provider am:
46368e4f5c -s ours
am:
d16ceb6e8e -s ours
am skip reason: change_id Ib1b4fba54ebd3599fe11021d21dc9b09d34e8965 with SHA1
a6364d92ed is in history
Change-Id: Ice282a3bab56a6defb124967d84e47b83893cca1
Pinyao Ting [Thu, 5 Sep 2019 19:05:29 +0000 (12:05 -0700)]
[automerger skipped] fixes a security vulnerability in slice provider
am:
46368e4f5c -s ours
am skip reason: change_id Ib1b4fba54ebd3599fe11021d21dc9b09d34e8965 with SHA1
a6364d92ed is in history
Change-Id: I62e3dde45298fd57b903cd4dfa1210041789c214
Jonathan Scott [Thu, 5 Sep 2019 16:31:12 +0000 (17:31 +0100)]
Add MANAGED_PROVISIONING_DPC_DOWNLOADED.
Test: Just adding a constant
Bug:
132261064
Change-Id: I2bce277ff8f2de4614e19d5385fe6712b076f9c9
Merged-In: I2bce277ff8f2de4614e19d5385fe6712b076f9c9
Fabian Kozynski [Thu, 5 Sep 2019 02:30:30 +0000 (19:30 -0700)]
Merge "Use UnlockMethodCache#canSkipBouncer in user switcher" into qt-dev
am:
57e8d83cab
Change-Id: I961586609af7d995b30b0a7bb61a7785a281a41e
TreeHugger Robot [Thu, 5 Sep 2019 02:17:20 +0000 (02:17 +0000)]
Merge "Use UnlockMethodCache#canSkipBouncer in user switcher" into qt-dev
Pinyao Ting [Wed, 4 Sep 2019 23:40:54 +0000 (16:40 -0700)]
Merge "fixes a security vulnerability in slice provider" into qt-dev
am:
bc59740fe4
Change-Id: Iba3a00da2706910d34cb53cc999047c16023cf93
TreeHugger Robot [Wed, 4 Sep 2019 23:17:52 +0000 (23:17 +0000)]
Merge "fixes a security vulnerability in slice provider" into qt-dev
Fabian Kozynski [Wed, 4 Sep 2019 20:53:37 +0000 (16:53 -0400)]
Use UnlockMethodCache#canSkipBouncer in user switcher
KeyguardMonitor#canSkipBouncer was not updated properly when the phone
was unlocked using fingerprint.
This CL removes that method and changes UserSwitcherController to query
UnlockMethodCache directly, as it was KeyguardMonitor's only client for
that method.
Test: manual unlocking with FP and with pattern
Test: no automated test yet
Bug:
140486529
Merged-In: Idbff4fbabca962c632ff5d78b25418c0502db9a7
Change-Id: Idbff4fbabca962c632ff5d78b25418c0502db9a7
TreeHugger Robot [Sat, 31 Aug 2019 23:09:41 +0000 (23:09 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
Bill Yi [Sat, 31 Aug 2019 16:57:02 +0000 (09:57 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ia7bda04820c874310de721e717aff0c64bbf4d47
Long Ling [Fri, 30 Aug 2019 23:32:14 +0000 (23:32 +0000)]
Merge "[DO NOT MERGE] Check property name before apply high refresh rate black list" into qt-r1-dev
Long Ling [Fri, 30 Aug 2019 23:29:39 +0000 (23:29 +0000)]
Merge "DMD: Support 90hz only in the refresh rate zone" into qt-r1-dev
Long Ling [Tue, 13 Aug 2019 23:07:14 +0000 (16:07 -0700)]
[DO NOT MERGE] Check property name before apply high refresh rate black list
Bug:
140233077
Change-Id: Ib2afc54c43ae5a9f3af8a0a0e65bc2c930428152
Long Ling [Tue, 20 Aug 2019 22:01:14 +0000 (15:01 -0700)]
DMD: Support 90hz only in the refresh rate zone
Also allow DeviceConfig to change the zone behavior
to 60 Hz only.
Change BrightObserver priority to be the lowest so application
request won't be overriden by BrightnessObserver
Bug:
139487676
Change-Id: I959550350c1ea72f764984226350ebc6e7de591c
Richard Uhler [Fri, 30 Aug 2019 07:58:06 +0000 (07:58 +0000)]
Merge "Disable flaky testBadApkOnly test." into qt-r1-dev
Kevin Hufnagle [Fri, 30 Aug 2019 01:52:02 +0000 (18:52 -0700)]
Merge "docs: Improved tick/click effect descriptions" into qt-dev
am:
a7496671da
Change-Id: Id33aa9b90e3a62751a9fa7a4074a44737d7a95e3
Kevin Hufnagle [Fri, 30 Aug 2019 01:26:35 +0000 (01:26 +0000)]
Merge "docs: Improved tick/click effect descriptions" into qt-dev
Nikita Ioffe [Thu, 29 Aug 2019 22:09:33 +0000 (15:09 -0700)]
Merge "Unset INSTALL_DISABLE_VERIFICATION flag if install is not from system" into qt-dev
am:
b739b582ad
Change-Id: I14bc50edcee6bcfe5b8979f0186b37486f2eff3f
TreeHugger Robot [Thu, 29 Aug 2019 21:47:30 +0000 (21:47 +0000)]
Merge "Unset INSTALL_DISABLE_VERIFICATION flag if install is not from system" into qt-dev
Kevin Hufnagle [Thu, 29 Aug 2019 04:29:08 +0000 (04:29 +0000)]
docs: Improved tick/click effect descriptions
Test: make ds-docs -j32
Bug:
139888074
Change-Id: I939aaa4cf81ddab1705611222c12a60823493d38
Kevin Hufnagle [Thu, 29 Aug 2019 00:16:27 +0000 (17:16 -0700)]
Merge "docs: Added desc. of launcher app criteria in Q" into qt-dev
am:
b14d2dede2
Change-Id: Ie0f494cf950278cf1f0ed634fa5bc852852213f3
Pinyao Ting [Thu, 8 Aug 2019 22:35:20 +0000 (15:35 -0700)]
fixes a security vulnerability in slice provider
Bug:
138441555
Test: Manual
Change-Id: Ib1b4fba54ebd3599fe11021d21dc9b09d34e8965
Merged-In: Ib1b4fba54ebd3599fe11021d21dc9b09d34e8965
(cherry picked from commit
2b415a4c4465a6294e51ad1a8fcf2e6c1497853b)
Kevin Hufnagle [Wed, 28 Aug 2019 22:08:47 +0000 (22:08 +0000)]
Merge "docs: Added desc. of launcher app criteria in Q" into qt-dev
Andrew Solovay [Wed, 28 Aug 2019 20:14:39 +0000 (13:14 -0700)]
Merge "Docs: clarify getSharedPreferences behavior" into qt-dev
am:
3791f9b071
Change-Id: I016d0a42219a21833b98432869607c0b41f71c0b
Andrew Solovay [Wed, 28 Aug 2019 18:11:44 +0000 (18:11 +0000)]
Merge "Docs: clarify getSharedPreferences behavior" into qt-dev
Kevin Hufnagle [Thu, 15 Aug 2019 00:23:58 +0000 (17:23 -0700)]
docs: Added desc. of launcher app criteria in Q
As of Android Q, an app is included in the return value of
LauncherApps#getActivityList() unless it fulfills specific criteria.
This CL describes the conditions necessary for an app's activities
to *not* appear in the list.
Test: make ds-docs -j32
Bug:
130352392
Change-Id: I6a6e17351a6c1234229d1d7eb8147ee2c24ee2c9
Richard Uhler [Wed, 28 Aug 2019 09:19:06 +0000 (10:19 +0100)]
Disable flaky testBadApkOnly test.
A proper fix for the flakiness has been submitted to more recent
versions of the RollbackTest.
Bug:
139108668
Bug:
139175593
Test: atest StagedRollbackTest
Change-Id: Iad20ac3744b0cf4adf0355150ce957de2a24304c
Merged-In: Iaaa728aa58d894ba546677e8295faba2ebfc5e64
Shimi Zhang [Wed, 28 Aug 2019 01:59:46 +0000 (18:59 -0700)]
Merge "aw: Correct doc of addJavascriptInterface()" into qt-dev
am:
62c764e29b
Change-Id: Ib1d1aa6262c3571c4c4f284b12dfe1ec5b40e3c8
TreeHugger Robot [Wed, 28 Aug 2019 01:39:59 +0000 (01:39 +0000)]
Merge "aw: Correct doc of addJavascriptInterface()" into qt-dev
Daniel Rosenberg [Wed, 28 Aug 2019 01:10:41 +0000 (18:10 -0700)]
Use mContext directly
am:
dd3737611c
Change-Id: Icf6e6216a789f8f7899eeae39cd253e285d7c98e
Nate Fischer [Tue, 27 Aug 2019 23:37:00 +0000 (16:37 -0700)]
Docs: clarify getSharedPreferences behavior
No change to logic, only documentation.
This updates Context#getSharedPreferences docs:
* Fix a typo ("thead" -> "thread")
* Formatting: use <p> when appropriate, {@link} to other APIs, limit
the @param to only a single sentence
* Mention getSharedPreferences() may actually perform disk IO (this was
undocumented)
* Mention Editor#apply() as well as #commit()
Fixes:
140137651
Test: make docs
Change-Id: I245371d13d4f317c6c522debcdf7938ab783f897
Nikita Ioffe [Tue, 30 Jul 2019 16:10:27 +0000 (17:10 +0100)]
Unset INSTALL_DISABLE_VERIFICATION flag if install is not from system
Bug:
138650665
Test: pushed manual privapp that attempts an install
with INSTALL_DISABLE_VERIFICATION flag.
Checked that PackageVerifier was called.
Change-Id: I041d2e5f6d2609bfe9475f24eefb936f0c8e2a32
Merged-In: I041d2e5f6d2609bfe9475f24eefb936f0c8e2a32
Jayachandran Chinnakkannu [Tue, 27 Aug 2019 21:46:01 +0000 (21:46 +0000)]
Merge "5GE Icon: Show 5G subscript E (italics)" into qt-r1-dev
Daniel Rosenberg [Tue, 27 Aug 2019 02:29:45 +0000 (19:29 -0700)]
Use mContext directly
We already have the context saved, so we can just use that.
Test: Edited code to force expection path to be called, confirmed
reboot happens
Bug:
138952436
Bug:
140111727
Change-Id: I40e95d72c63f864131f0028c47f121463d0f6dff
Kevin Hufnagle [Mon, 26 Aug 2019 22:10:39 +0000 (15:10 -0700)]
Merge "docs: Added content desc in ImageView example." into qt-dev
am:
eba5156095
Change-Id: I08a66c2da26833978d2ed4b77de175b3bfe78931
Kevin Hufnagle [Mon, 26 Aug 2019 21:05:37 +0000 (21:05 +0000)]
Merge "docs: Added content desc in ImageView example." into qt-dev
Shimi Zhang [Mon, 26 Aug 2019 18:01:12 +0000 (11:01 -0700)]
aw: Correct doc of addJavascriptInterface()
The Javadoc of addJavascriptInterface() mentioned that the injected
Java object will be injected to main frame, but this is not telling
a full picture. The current implementation will inject the Java
object to all the frames actually.
This CL corrected the misleading wording and add a new warning to
explicitly call it out as a security risk.
Bug:
113336656
Test: make ds-docs
Change-Id: Ia79381d1ab38afa963ea7365526749c14e25238c
Paul Hu [Mon, 26 Aug 2019 03:21:52 +0000 (20:21 -0700)]
Add SocketUtils CTS tests
am:
0141ef0948
Change-Id: I92a6b3e5cb1fa993dfaeacb442cbf6b401dd5996
Bill Yi [Sun, 25 Aug 2019 07:48:06 +0000 (00:48 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ida726221a394a3d372b293f4023dfe53658ab926
Paul Hu [Tue, 18 Jun 2019 11:26:29 +0000 (04:26 -0700)]
Add SocketUtils CTS tests
Test APIs below:
makeNetlinkSocketAddress(int, int)
makePacketSocketAddress(short, int)
makePacketSocketAddress(int, byte[])
closeSocket(java.io.FileDescriptor)
Bug:
129200596
Test: atest FrameworksNetTests
atest CtsNetTestCases --instant
Merged-In: I36252fdf516cf4a9d4506b615cdb38f5413739e5
(cherry picked from commit
93a53224d3a1cd6fc1de7d94955e03116b744e4a)
Change-Id: I0963acaf00c5bdd93db0503c426f190f409ca076
TreeHugger Robot [Fri, 23 Aug 2019 00:38:24 +0000 (00:38 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
vagdevi [Thu, 22 Aug 2019 19:02:47 +0000 (12:02 -0700)]
5GE Icon: Show 5G subscript E (italics)
URL: https://screenshot.googleplex.com/SpTnerVCnQZ.png
Bug:
139776677
Test: manual using PARIS Override for
show_carrier_data_icon_pattern_string
Change-Id: I69e32c89558fba884bb12d29cb8ff81470591bb0
Adrian Salido [Thu, 22 Aug 2019 22:53:56 +0000 (22:53 +0000)]
Merge "Revert "Hold Display suspend blocker until doze starts"" into qt-r1-dev
Bill Yi [Thu, 22 Aug 2019 22:35:19 +0000 (15:35 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I10ae69007f380648f07514a5ffb7de97bb7471d5
Adrian Salido [Thu, 22 Aug 2019 20:41:15 +0000 (20:41 +0000)]
Revert "Hold Display suspend blocker until doze starts"
This reverts commit
93e164726f2d243eb75351b4e52d683573f9f802.
Reason for revert: This is causing wake lock to remain held
while screen is off
Bug:
139875245
Change-Id: I0ff714a0cf2496d141d355de68761ab720a09539
Adrian Salido [Thu, 22 Aug 2019 02:09:34 +0000 (02:09 +0000)]
Merge "DO NOT MERGE DMD: Support minimum refresh rate" into qt-r1-dev
TreeHugger Robot [Thu, 22 Aug 2019 00:22:43 +0000 (00:22 +0000)]
Merge "Hold Display suspend blocker until doze starts" into qt-r1-dev
TreeHugger Robot [Wed, 21 Aug 2019 23:54:25 +0000 (23:54 +0000)]
Merge "Only delay bouncer if bypass is off" into qt-r1-dev
Santos Cordon [Wed, 21 Aug 2019 21:25:44 +0000 (22:25 +0100)]
Hold Display suspend blocker until doze starts
When transitioning to DOZE, there is a race condition between the
release of the display suspend blocker and calling startDream. This
creates a gap where the device can suspend before the dream actually
starts. In practice, this can cause gestures, which are nitialized
from the Dream Service, to not function until something else
temporarily wakes up the device enough for the CPU to run a few
cycles.
This change delays the release of the display suspend blocker if
there is a pending recalculation of the sleep/doze state.
Bug:
138828701
Test: Manual testing - was 1 in 5 chance of reproing. Tested up to
0 out of 50 after the fix.
Test: atest PowerManagerServiceTest
Change-Id: Ic6df469972dc5765a8c4507404d1dc33f13ec0c3
Lucas Dupin [Thu, 15 Aug 2019 18:41:52 +0000 (11:41 -0700)]
Only delay bouncer if bypass is off
Test: pull up bouncer with bypass on and off
Test: atest KeyguardBouncerTest
Fixes:
137563419
Change-Id: I5ca00ebacda2c893bf62d5c882fe0a244b77f4fc
Merged-In: I5ca00ebacda2c893bf62d5c882fe0a244b77f4fc
(cherry picked from commit
d969b7622420482a4836378a8ad5d61b38e6755c)
Bill Yi [Wed, 21 Aug 2019 20:53:24 +0000 (13:53 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: If6e4358b08995e5caaaaa90bba9fff23f4e4a486
Long Ling [Sun, 18 Aug 2019 01:02:46 +0000 (18:02 -0700)]
DO NOT MERGE DMD: Support minimum refresh rate
Bug:
139685237
Change-Id: Ib41dee351276d70733fffa18620455e4e6f9ddfc
Long Ling [Wed, 21 Aug 2019 19:35:12 +0000 (19:35 +0000)]
Merge changes from topic "device_config_for_display_90" into qt-r1-dev
* changes:
DO NOT MERGE Move device config key high_refresh_rate_blacklist to display_manager
DO NOT MERGE Allow DeviceConfig to change display settings
DO NOT MERGE DeviceConfig: Add Name space and keys for Display Manager
TreeHugger Robot [Wed, 21 Aug 2019 19:04:49 +0000 (19:04 +0000)]
Merge "Mark USAGE_NOTIFICATION_EVENT vibrations as notifications" into qt-r1-dev
Hall Liu [Wed, 21 Aug 2019 18:28:20 +0000 (18:28 +0000)]
Merge "Add carrier config for ignoring user RTT setting" into qt-r1-dev
Long Ling [Tue, 13 Aug 2019 23:07:14 +0000 (16:07 -0700)]
DO NOT MERGE Move device config key high_refresh_rate_blacklist to display_manager
high_refresh_rate_blacklist belongs to smooth display feature. Move the
key from namespace window_manager to display_manager.
Bug:
139138964
Test: atest WmTests:HighRefreshRateBlacklistTest
Test: Manual adb shell device_config/dumpsys window
Change-Id: I3ae8ecce80ef97c4683a1c18ad81dc78456e9d57
Long Ling [Thu, 8 Aug 2019 23:05:44 +0000 (16:05 -0700)]
DO NOT MERGE Allow DeviceConfig to change display settings
Allow DeviceConfig to change default refresh rate and 60 hz only
thresholds.
Bug:
139138964
Change-Id: I3bf5f8cf7a99e4723265138004fbbd08102119d9