OSDN Git Service
Rubin Xu [Tue, 31 Oct 2017 15:40:32 +0000 (15:40 +0000)]
Swap the order of synthetic password wrapping
Synthetic password is double encrypted by both a random auth-bound keymaster
key and a secret derived from user password. In order to avoid a password
verification oracle without rate limiting, synthetic password needs to be
encrypted by the derived secret first, and then the auth-bound key. This
change corrects the order of encryptions, as well as adds an upgrade path to
refresh existing credentials.
Test: Running an old build with existing password, flash to new build,
verify the device unlocks successfully.
Bug:
68694819
Change-Id: Ifdaa01f3f4ddd5bb3f3d808d38f440ced729034f
Merged-In: Ifdaa01f3f4ddd5bb3f3d808d38f440ced729034f
Patrik Torstensson [Fri, 13 Oct 2017 01:30:40 +0000 (01:30 +0000)]
Merge "Incorporate slab reclaimable into meminfo" into oc-mr1-dev
Robert Benea [Thu, 5 Oct 2017 01:28:01 +0000 (18:28 -0700)]
Incorporate slab reclaimable into meminfo
Instead of using the whole slab mem for kernel usage, split the
unreclaimable to kernel and reclaimable to cache (since is freed
under mem. pressure).
Test: tested on gobo
Bug:
67753120
Change-Id: I0f5a310bb88603ad7bb28e5398ea57c249c04fc2
Pankaj Kanwar [Fri, 13 Oct 2017 00:26:11 +0000 (00:26 +0000)]
Merge "Cleanup of Cellular/Wifi aggregate statistics" into oc-mr1-dev
TreeHugger Robot [Thu, 12 Oct 2017 23:58:02 +0000 (23:58 +0000)]
Merge "DO NOT MERGE Turn off logcat logging for smart selection logs." into oc-mr1-dev
Abodunrinwa Toki [Thu, 12 Oct 2017 20:20:16 +0000 (21:20 +0100)]
DO NOT MERGE Turn off logcat logging for smart selection logs.
Bug:
64914512
Test: none
Change-Id: Ia85f021171a40ebc58bd98020626911961055302
Winson Chung [Thu, 12 Oct 2017 20:34:16 +0000 (20:34 +0000)]
Merge "Skip drawing snapshot if we can't create the buffer." into oc-mr1-dev
TreeHugger Robot [Thu, 12 Oct 2017 01:47:26 +0000 (01:47 +0000)]
Merge "Set the global priority session immediately after its flag is set" into oc-mr1-dev
TreeHugger Robot [Thu, 12 Oct 2017 01:24:48 +0000 (01:24 +0000)]
Merge "Don't recycle replaced nodes in a11y cache" into oc-mr1-dev
Hall Liu [Wed, 11 Oct 2017 23:53:11 +0000 (23:53 +0000)]
Merge "Fix URI unparceling and clarify an error condition" into oc-mr1-dev
Siddharth Ray [Tue, 3 Oct 2017 00:30:58 +0000 (17:30 -0700)]
Cleanup of Cellular/Wifi aggregate statistics
Cleanup of Cellular/Wifi aggregate statistics in Batterystats dumpsys
Cellular
- Modification of field names to improve clarity
- Removed count "x" values
- Added power values to Rx signal strength
- Added power values to Tx power
- Added "Cellular Sleep time"
- Removed erroneous battery field (This is being fixed in b/
67213886,
b/
67213967)
- Removed the following fields (Mobile radio active unknown time, Mobile
radio active adjusted time, Signal scanning time)
Wifi
- Modification of field names to improve clarity
- Removed count "x" values
- Added power values to Rx signal strength
- Removed the following field (Wifi on, Wifi running)
BUG:
67322291
Change-Id: I9630f154a73c7e3cb4bae4779609302f3674602f
Jeff Sharkey [Wed, 11 Oct 2017 23:08:02 +0000 (23:08 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571 am:
300e6ffafb am:
f1f2a61fb7 am:
92d80b72aa am:
d6e3d358d4 -s ours am:
bbcb8e4976
am:
753a9ab308
Change-Id: I32ca3f3a6ede37fdc2bd3ed1f03374b45cdb2697
Jeff Sharkey [Wed, 11 Oct 2017 22:51:51 +0000 (22:51 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours am:
e9d2113af7 am:
8860624853 am:
7512875224 am:
44adace6c6 am:
af93051ac4 -s ours am:
620c5cfda0
am:
e286f08000
Change-Id: Iefbf0c8df06d6cea71d7ccdcd65ff4156a156419
Phil Weaver [Wed, 11 Oct 2017 19:53:54 +0000 (12:53 -0700)]
Don't recycle replaced nodes in a11y cache
This is a patch for another bug. When the cache refreshes
nodes, it marks the transaction to bypass the cache. We
still, however, replace the cached node. If we recycle
the node as well, we end up refreshing it after it's been
recycled and end up with a sealed node in the cache. That
node can then be obtained and then throw an exception when
a setter is called. These exceptions are almost impossible
to debug.
I'm going to leave the bug open to roll this CL back and
fix the cache's behavior, but this fix seems safer this
late.
Bug:
35626351
Test: Ran a11y CTS and unit tests. Verified on instrumented
master build that the error indeed goes away. Removing one
line from unit tests that requires recycling.
Change-Id: Icc9a43ee49cf7c6bfa996839b35954faaf31621c
Jeff Sharkey [Wed, 11 Oct 2017 22:51:13 +0000 (22:51 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571 am:
300e6ffafb am:
f1f2a61fb7 am:
92d80b72aa am:
d6e3d358d4 -s ours
am:
bbcb8e4976
Change-Id: I924de4599fbf76a83d06cc6e0982bd73067c033a
Jeff Sharkey [Wed, 11 Oct 2017 22:35:46 +0000 (22:35 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours am:
e9d2113af7 am:
8860624853 am:
7512875224 am:
44adace6c6 am:
af93051ac4 -s ours
am:
620c5cfda0
Change-Id: I07805d81dbcf65993d5dcb695d9877ad4a914bac
Jeff Sharkey [Wed, 11 Oct 2017 22:35:01 +0000 (22:35 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571 am:
300e6ffafb am:
f1f2a61fb7 am:
92d80b72aa
am:
d6e3d358d4 -s ours
Change-Id: Iece9faf3d2cbef432450c053d6440d94053bbb00
Jeff Sharkey [Wed, 11 Oct 2017 22:27:31 +0000 (22:27 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571 am:
300e6ffafb am:
f1f2a61fb7
am:
92d80b72aa
Change-Id: I872a35e35cf8a997108daad39447bbad36ccfcaf
Jeff Sharkey [Wed, 11 Oct 2017 22:23:16 +0000 (22:23 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours am:
e9d2113af7 am:
8860624853 am:
7512875224 am:
44adace6c6
am:
af93051ac4 -s ours
Change-Id: I93ce23ee4d45491a79346d11aed2cdb0fed0ef9f
Jeff Sharkey [Wed, 11 Oct 2017 22:12:39 +0000 (22:12 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours am:
e9d2113af7 am:
8860624853 am:
7512875224
am:
44adace6c6
Change-Id: I3d0c489f0a6b3522f93b6d3b4db7892d081dc11c
Jeff Sharkey [Wed, 11 Oct 2017 22:11:57 +0000 (22:11 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571 am:
300e6ffafb
am:
f1f2a61fb7
Change-Id: Ib999a03b6b52d8ca7446b1db6450578bab50d5d9
Jeff Sharkey [Wed, 11 Oct 2017 22:11:51 +0000 (22:11 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a am:
4a60106aa0 am:
72df97053c am:
da3d10591a am:
97f6a0da40 -s ours am:
3b47256ccf
am:
a7f0504849
Change-Id: Ib17c9471d7f3bdde18e3de4ad693fd9ef5312059
Jeff Sharkey [Wed, 11 Oct 2017 22:00:35 +0000 (22:00 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours am:
e9d2113af7 am:
8860624853
am:
7512875224
Change-Id: I55e255c4089089403a327cb0e24f750b5b9975ec
Jeff Sharkey [Wed, 11 Oct 2017 21:52:08 +0000 (21:52 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a am:
4a60106aa0 am:
72df97053c am:
da3d10591a am:
97f6a0da40 -s ours
am:
3b47256ccf
Change-Id: Ie321b5922ec83367ec93e528993fb205ebcad1ac
Jeff Sharkey [Wed, 11 Oct 2017 21:51:37 +0000 (21:51 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571
am:
300e6ffafb
Change-Id: Iaef9ffa2cdfd6cf424fa22e554df3a0ea4d3e41f
Jeff Sharkey [Wed, 11 Oct 2017 21:41:50 +0000 (21:41 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours am:
e9d2113af7
am:
8860624853
Change-Id: Iea7736cd9e60673296bd39377393fa785bd58b17
Jeff Sharkey [Wed, 11 Oct 2017 21:38:30 +0000 (21:38 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am:
9d3706046c am:
b4d23d55c2 am:
e1ae848970 -s ours am:
7f108b81b3
am:
4a71a2daf6
Change-Id: Id8a401121d8bff24b5695f0ad0d4c923da93995c
Jeff Sharkey [Wed, 11 Oct 2017 21:34:52 +0000 (21:34 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours
am:
ba1f2d2571
Change-Id: Ie72b8e52cd8717ac87d90627c1f53cbe2261c5e5
Jeff Sharkey [Wed, 11 Oct 2017 21:34:24 +0000 (21:34 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a am:
4a60106aa0 am:
72df97053c am:
da3d10591a
am:
97f6a0da40 -s ours
Change-Id: Icd0d048be2d037fa19befb94ccd8d6fda26bee74
Android Build Merger (Role) [Wed, 11 Oct 2017 21:26:04 +0000 (21:26 +0000)]
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am:
31c5adc279 am:
3f671b3194" into oc-mr1-dev
Jeff Sharkey [Wed, 11 Oct 2017 21:24:41 +0000 (21:24 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a am:
4a60106aa0 am:
72df97053c
am:
da3d10591a
Change-Id: I22ddd0fb81ca1acdb070a5872b4c0a31e197e15b
Hall Liu [Wed, 11 Oct 2017 02:08:24 +0000 (19:08 -0700)]
Fix URI unparceling and clarify an error condition
Use the proper unparceling method for lists, add a more verbose
exception for when the app fails to declare a critical piece of
metadata.
Change-Id: I29d5291d7b88476496334d268be94f7f8c08255c
Fixes:
67640653
Test: manual, with testapp
Jeff Sharkey [Wed, 11 Oct 2017 21:24:00 +0000 (21:24 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours
am:
e9d2113af7
Change-Id: Id1d09fd582e8a213f49e215af708291dfc76bb78
Jeff Sharkey [Wed, 11 Oct 2017 21:21:51 +0000 (21:21 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am:
31c5adc279
am:
3f671b3194
Change-Id: I16c9f75cf0181b834cbfa1a7e716aaced2768c5e
Jeff Sharkey [Wed, 11 Oct 2017 21:20:52 +0000 (21:20 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63
am:
8916c30c54 -s ours
Change-Id: Ia94b157d80bec5c24616af67c19bbceb0c384c36
TreeHugger Robot [Wed, 11 Oct 2017 21:19:54 +0000 (21:19 +0000)]
Merge "Fix alarm preview volume" into oc-mr1-dev
Jeff Sharkey [Wed, 11 Oct 2017 21:18:21 +0000 (21:18 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am:
9d3706046c am:
b4d23d55c2 am:
e1ae848970 -s ours
am:
7f108b81b3
Change-Id: I87e6ae95c5a4be28cd268bac73548de83cf61ed6
Jeff Sharkey [Wed, 11 Oct 2017 21:12:09 +0000 (21:12 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a am:
4a60106aa0
am:
72df97053c
Change-Id: I62e502ebc6ac642cac7165ce1ce0982675362ab3
Jeff Sharkey [Wed, 11 Oct 2017 21:03:59 +0000 (21:03 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am:
09984216e6 -s ours am:
5f17a285f9
am:
98371ee7c9
Change-Id: Ib74482b52dcd5e3ac21b4b61e6a56f3293cddbd5
Jeff Sharkey [Wed, 11 Oct 2017 21:00:20 +0000 (21:00 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am:
9d3706046c am:
b4d23d55c2
am:
e1ae848970 -s ours
Change-Id: Ic511d47f88b86fa999beae0363da07ee4fc1a3be
Jeff Sharkey [Wed, 11 Oct 2017 20:59:51 +0000 (20:59 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee
am:
e62d479921 -s ours
Change-Id: I1bc814da2ad8f108189d7f2293bf373b04434257
Jeff Sharkey [Wed, 11 Oct 2017 20:58:32 +0000 (20:58 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c
am:
5d60a49d63
Change-Id: I1b0f66ccf915436637a804ff0517c431b2813ec8
Jeff Sharkey [Wed, 11 Oct 2017 20:57:08 +0000 (20:57 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev
am:
31c5adc279
Change-Id: Id9a5a0216f1f26e059df45cc866582fe04cdf47d
Jeff Sharkey [Wed, 11 Oct 2017 20:47:31 +0000 (20:47 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a
am:
4a60106aa0
Change-Id: Iaace5d103229b9028d1b81602107af35857ca55c
Jeff Sharkey [Wed, 11 Oct 2017 20:47:31 +0000 (20:47 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am:
9d3706046c
am:
b4d23d55c2
Change-Id: Idfcdf295be77c9ab39d790e7793d2d772c92f9f7
Jeff Sharkey [Wed, 11 Oct 2017 20:46:21 +0000 (20:46 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am:
09984216e6 -s ours
am:
5f17a285f9
Change-Id: I9971bfff1c0792f78e4afe17a101ba6e6ae0cd2f
Jeff Sharkey [Wed, 11 Oct 2017 20:44:45 +0000 (20:44 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9
am:
d20cad62ee
Change-Id: Iaee355315a29be72ffd670178f88510aacdfc042
Jeff Sharkey [Wed, 11 Oct 2017 20:42:42 +0000 (20:42 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9
am:
7555eb508c
Change-Id: Ida6bf3d99469b443d6312066497ddb067569cd1d
TreeHugger Robot [Wed, 11 Oct 2017 20:37:04 +0000 (20:37 +0000)]
Merge "Check target api version before crashing apps." into oc-mr1-dev
Jeff Sharkey [Wed, 11 Oct 2017 20:34:50 +0000 (20:34 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev
am:
9d3706046c
Change-Id: I46ef6e731af52bd7404e580f85611804abb8bcef
Jeff Sharkey [Wed, 11 Oct 2017 20:34:48 +0000 (20:34 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev
am:
254369967a
Change-Id: I511e6d122a5717b36ad78d8100ed728ef862adff
TreeHugger Robot [Wed, 11 Oct 2017 20:34:39 +0000 (20:34 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev
Jeff Sharkey [Wed, 11 Oct 2017 20:32:40 +0000 (20:32 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
am:
04b96d76a9
Change-Id: Ie2ae7f5071a534e1245c92293014963c8e4187ca
Jeff Sharkey [Wed, 11 Oct 2017 20:31:35 +0000 (20:31 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
am:
d87d2746a9
Change-Id: Ia5455efc69556e5a52b1cc945e99b2ef51fdcd23
Jeff Sharkey [Wed, 11 Oct 2017 20:30:25 +0000 (20:30 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev
am:
09984216e6 -s ours
Change-Id: I3dcf7d6fdf11a8ed82d6f2362a18b12afaff1120
TreeHugger Robot [Wed, 11 Oct 2017 20:23:53 +0000 (20:23 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev
TreeHugger Robot [Wed, 11 Oct 2017 20:23:33 +0000 (20:23 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev
TreeHugger Robot [Wed, 11 Oct 2017 20:22:22 +0000 (20:22 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev
Bill Yi [Wed, 11 Oct 2017 20:17:36 +0000 (20:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
e721fbddb5 -s ours
am:
1018a5d4a1 -s ours
Change-Id: I7edb906e7c2e0e76cb4a523d3e70418c57fc14bd
Bill Yi [Wed, 11 Oct 2017 20:09:44 +0000 (20:09 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
e721fbddb5 -s ours
Change-Id: Ic2a012410d13daece6049836eb20f1109011a4a6
TreeHugger Robot [Wed, 11 Oct 2017 19:59:02 +0000 (19:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Wed, 11 Oct 2017 19:47:14 +0000 (19:47 +0000)]
Import translations. DO NOT MERGE am:
757057a5b5 -s ours am:
6fd592553c -s ours am:
fcde0eda85 -s ours
am:
bb04ab9aa1 -s ours
Change-Id: Ia8b54c4fec8e8fec06bdca38bf948af8a222e8b2
Bill Yi [Wed, 11 Oct 2017 19:37:05 +0000 (19:37 +0000)]
Import translations. DO NOT MERGE am:
757057a5b5 -s ours am:
6fd592553c -s ours
am:
fcde0eda85 -s ours
Change-Id: I68381bf426aedbb2a0bb365364f7462ab3bdb585
TreeHugger Robot [Wed, 11 Oct 2017 19:34:45 +0000 (19:34 +0000)]
Merge "Document how to handle save on multi-steps activity." into oc-mr1-dev
Bill Yi [Wed, 11 Oct 2017 19:27:42 +0000 (19:27 +0000)]
Import translations. DO NOT MERGE am:
757057a5b5 -s ours
am:
6fd592553c -s ours
Change-Id: I2488e81c41395d3aedf20f02f61dfb9f67c5aa29
Bill Yi [Wed, 11 Oct 2017 19:20:06 +0000 (19:20 +0000)]
Import translations. DO NOT MERGE
am:
757057a5b5 -s ours
Change-Id: I35b629a43daf6ef991fc4ec61a4aba933cad0ae2
TreeHugger Robot [Wed, 11 Oct 2017 18:12:33 +0000 (18:12 +0000)]
Merge "Send a11y updates for updated notifications" into oc-mr1-dev
Julia Reynolds [Wed, 11 Oct 2017 12:44:46 +0000 (08:44 -0400)]
Check target api version before crashing apps.
All foreground service notifications need to be posted to a valid
notification channel, but only crash apps that don't provide a
valid notification if they target O_MR1+.
Fixes:
66905243
Test: manual, open apps with invalid notifications that do and don't
target O_MR1.
Change-Id: I60897302bf9806cba0e0be365e65c5e8c4ef4806
Felipe Leme [Tue, 10 Oct 2017 22:53:04 +0000 (15:53 -0700)]
Document how to handle save on multi-steps activity.
Test: ran 'm -j doc-comment-check-docs' and checked resulting HTML
Fixes:
67650364
Change-Id: Ib9e6c63e537b47a0670fe6bdf5163e8ab80eef0c
Bernardo Rufino [Tue, 3 Oct 2017 12:55:10 +0000 (13:55 +0100)]
Canonicalize notification channel sounds for backup
Canonicalize for backup and canonicalize and uncanonicalize for restore
(see comment).
Test: Set custom notification sound, make backup, remove notification
sound from device (from Ringtones and make sure to update media content
provider), restore => Observe default instead of random number. Do the
same without removing the sound and observe restores successfully.
Test: runtest systemui-notification
Bug:
66444697
(cherry picked from commit
c27bb6ad34fd59161f6460b692ba72c7ede789b6)
Change-Id: I32c186d0d7479b01f6cc67cce9bc5cb66264a064
Bill Yi [Wed, 11 Oct 2017 07:21:44 +0000 (00:21 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I9b8f913edd4d61427600f47c91644750e6dff3c5
Jaewan Kim [Tue, 10 Oct 2017 07:49:58 +0000 (16:49 +0900)]
Set the global priority session immediately after its flag is set
The MediaSessionService has set the global priority session only after
the session becomes active for the first time.
From the bug reports, com.android.settings (shares the UID with the
global priority session) made sound before that. So the global priority
session became the media button session before the service handle it
specially.
This CL fixes the issue by moving the global priority session
immediately after the FLAG_EXCLUSIVE_GLOBAL_PRIORITY is set.
Bug:
67322829
Test: Run CtsMediaTest and CtsMediaHostTest.
Also did the manual test described in the issue.
Change-Id: Iea9543b00a783b32dbc26f682d2352068c69e413
TreeHugger Robot [Wed, 11 Oct 2017 02:55:29 +0000 (02:55 +0000)]
Merge "Fixed problem where scrim transition would be cancelled" into oc-mr1-dev
TreeHugger Robot [Wed, 11 Oct 2017 01:35:07 +0000 (01:35 +0000)]
Merge "Log upstream network suspend/resume callbacks" into oc-mr1-dev
Jean-Michel Trivi [Tue, 10 Oct 2017 23:32:38 +0000 (16:32 -0700)]
Fix alarm preview volume
SeekBarVolumizer: do not use FLAG_BYPASS_INTERRUPTION_POLICY as
there is no need to bypass DnD modes in seek bar for volume
since they are disabled according to the DnD mode.
AudioService (PlaybackActivityMonitor): check both
AudioAttributes flags BYPASS_INTERRUPTION_POLICY and
BYPASS_MUTE for forced alarm playback (see b/
63617557).
Test: see bug
Bug:
67578783
Change-Id: Iaf43f16d96d1ad8a1eacc73a050db767004ba96b
Lucas Dupin [Wed, 11 Oct 2017 00:31:09 +0000 (17:31 -0700)]
Fixed problem where scrim transition would be cancelled
Change-Id: I089e499bfaf524898f5156aecaf098c94b9a1b2b
Fixes:
64077859
Test: send notifications, look at AoD
Vlad Zavidovych [Tue, 10 Oct 2017 23:46:42 +0000 (23:46 +0000)]
Merge "Add header to DropBox crash reports to indicate instant app crash" into oc-mr1-dev
TreeHugger Robot [Tue, 10 Oct 2017 22:58:25 +0000 (22:58 +0000)]
Merge "Logs UID that requested a bugreport." into oc-mr1-dev
Brad Ebinger [Tue, 10 Oct 2017 22:47:18 +0000 (22:47 +0000)]
Merge "Require DownloadRequest#Builder to have mandatory Source URI" into oc-mr1-dev
Bill Yi [Tue, 10 Oct 2017 22:31:12 +0000 (15:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4d38b1392fb97117f7a403a224fc65a871dcea19
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
TreeHugger Robot [Tue, 10 Oct 2017 22:22:38 +0000 (22:22 +0000)]
Merge "Wrap StackOverflowError in NotFoundException. Bug:
67462465 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e" into oc-mr1-dev
Brad Ebinger [Mon, 9 Oct 2017 18:23:21 +0000 (11:23 -0700)]
Require DownloadRequest#Builder to have mandatory Source URI
This change modifies the API to require that the
DownloadRequest#Builder includes the Source URI as a mandatory,
non-null parameter.
Test: Manual, Telephony Test MBMS app
Bug:
67640102
Merged-In: I25b39008317e333d422cd32a0c6348c010ca280f
Change-Id: I7d44e977314a57fdf063aa233bfb978b48ebf1db
Hyunyoung Song [Tue, 10 Oct 2017 17:35:59 +0000 (10:35 -0700)]
Wrap StackOverflowError in NotFoundException.
Bug:
67462465
Test: builds and tested using faulty apk with recursive drawable.
Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e
Julia Reynolds [Tue, 10 Oct 2017 17:58:49 +0000 (13:58 -0400)]
Send a11y updates for updated notifications
Unless the updated notification is quiet.
Test: runtest systemui-notification
Change-Id: I0d0b27cedf085c00648d00ed63f252f94d8e5e35
Fixes:
67626983
Michael Wright [Tue, 10 Oct 2017 17:50:56 +0000 (17:50 +0000)]
Merge "Ignore non-repeating vibrations in favor of repeating vibrations." into oc-mr1-dev
Vlad Zavidovych [Thu, 5 Oct 2017 22:37:13 +0000 (15:37 -0700)]
Add header to DropBox crash reports to indicate instant app crash
Bug:
62372653
Test: runtest -c com.android.server.am.ActivityManagerServiceTest frameworks-services
Change-Id: I5a3d293d4bd7b54b6fcfe26516e51aff15354ded
(cherry picked from commit
9cab93555579dd73607dfa4f526ea3a0df456843)
Brad Ebinger [Tue, 10 Oct 2017 17:14:35 +0000 (17:14 +0000)]
Merge "Fix NPE when removing PIN locked SIM during E911 call" into oc-mr1-dev
Andrew Solovay [Tue, 10 Oct 2017 16:29:06 +0000 (16:29 +0000)]
Merge "docs: Tiny usage fix ("e-mail" -> "email")" into oc-mr1-dev
Erik Kline [Tue, 10 Oct 2017 02:54:08 +0000 (11:54 +0900)]
Log upstream network suspend/resume callbacks
Also log signal strength while we're at it:
2017-10-10T14:05:00.968 - [UpstreamNetworkMonitor] preferred upstream type: WIFI
2017-10-10T14:06:07.654 - [UpstreamNetworkMonitor] upstream network signal strength: -62 -> -67
2017-10-10T14:06:13.704 - [UpstreamNetworkMonitor] upstream network signal strength: -67 -> -64
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
29337859
Bug:
32163131
Bug:
64976634
Bug:
67396342
Change-Id: Id6e143edc9f5b0256aa637643680f6c8dce70d90
TreeHugger Robot [Tue, 10 Oct 2017 05:44:55 +0000 (05:44 +0000)]
Merge "MediaSessionService: Prevent getActiveSessions() from growing infinitely" into oc-mr1-dev
Andrew Solovay [Sat, 7 Oct 2017 02:02:28 +0000 (19:02 -0700)]
docs: Tiny usage fix ("e-mail" -> "email")
I needed to make an edit in this branch to verify part of our docs
process, so I found a Javadoc typo to fix. No code error, just took
out the hyphen in "e-mail" in a Javadoc comment.
Test: make ds-docs
Bug:
67515954
Change-Id: Icb9b2a9df0d7dfd697050735886adec80bc92ff8
Andrew Solovay [Tue, 10 Oct 2017 01:19:14 +0000 (01:19 +0000)]
Merge "docs: Adding API level 27 (Oreo MR1) to the docs build options" into oc-mr1-dev
TreeHugger Robot [Mon, 9 Oct 2017 23:14:25 +0000 (23:14 +0000)]
Merge "Expose RECORD_AUDIO to Instant Apps" into oc-mr1-dev
Brad Ebinger [Thu, 5 Oct 2017 18:39:06 +0000 (11:39 -0700)]
Fix NPE when removing PIN locked SIM during E911 call
There is the possibility of mCallback being null while
the Keyguard still has a PhoneStateListener registered
for onSimStateChanged callback. This can cause a NPE.
Bug:
66986066
Test: Manual, PIN/PUK locked SIM
Merged-In: Id8ca403a839cff994970c370973a91e8e5688722
Change-Id: I799c9521f787e800e259c3bdce9edee3f844f5f3
Makoto Onuki [Sat, 23 Sep 2017 00:22:50 +0000 (17:22 -0700)]
Don't take a lock on the UI thread.
Bug
66719356
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest10 -w com.android.frameworks.servicestests
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsShortcutManagerTestCases
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsShortcutHostTestCases
Change-Id: I1045eda4910e3c7d3172038a1efd31cdf9346729
TreeHugger Robot [Mon, 9 Oct 2017 18:01:54 +0000 (18:01 +0000)]
Merge "Decreases likelihood of AoD flickering" into oc-mr1-dev
Chad Brubaker [Mon, 9 Oct 2017 17:50:46 +0000 (10:50 -0700)]
Expose RECORD_AUDIO to Instant Apps
This runtime permission should have been exposed to Instant Apps but
incorrectly was not
Bug:
67578813
Test: cts-tradefed run cts -m CtsPermission2TestCases
Change-Id: Icad01cc8e99f52c6e638f54aaf78e9cc56475fc4
Winson Chung [Fri, 6 Oct 2017 21:01:10 +0000 (14:01 -0700)]
Skip drawing snapshot if we can't create the buffer.
Bug:
63436798
Test: Only a NPE check
Change-Id: I1c87d9dfcf828e3c7d4fb070e7492834761224e7
Rubin Xu [Fri, 6 Oct 2017 11:07:32 +0000 (12:07 +0100)]
Always synchronize the OEM unlock allowed bit to the FRP partition
For devices using OEMLock HAL, OEM unlock allowed bit is maintained by the HAL.
However PersistentDataBlockService will only look at the OEM unlock allowed bit
on the pst partition to make sure FRP data is cleared on a unlockable device.
As a short term fix, make sure the OEM unlock allowed bit on both the HAL and pst
partition is always in sync.
Bug:
67043266
Test: On walleye/taimen, add an account, enable OEM unlock, factory reset
via fastboot, and observe FRP is not enforced.
Change-Id: Id4a0d81d7a424e17c2751e7e65582b51c14bd073
Michael Wright [Thu, 5 Oct 2017 18:04:14 +0000 (14:04 -0400)]
Ignore non-repeating vibrations in favor of repeating vibrations.
This way we don't inadvertently cancel things like alarms and ring
tone vibrations in favor of one shot vibrations, which are typically
shorter and meant to be feedback rather than attention getting.
Test: start alarm, hit home button, see alarm vibration isn't cancelled.
Bug:
65621937
Change-Id: Ib7fcaea7bc7f101d738b72112c8d5096c4b34ca2