Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
203,369 Commits 3 Branches 0 Tags
0cc02190896def71f46533806cb4d7bfa20d950e
Commit Graph

203369 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Charles He
0cc0219089 Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 
am: 76ca2da7e8

Change-Id: I9e20b2954ccb462cee31cb5ea44986c00afadbff
 2016-12-29 10:20:47 +00:00
Charles He
e15e0de7e5 Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 
am: b64af9bacd

Change-Id: I261c46544e8e1aef26772d57475037810198e4d9
 2016-12-29 10:19:49 +00:00
Charles He
e5156ec1e9 Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 
am: 00a581f882

Change-Id: I016955744e48d7a91380c2ff39f7c64536a39c7e
 2016-12-29 10:18:49 +00:00
Charles He
76ca2da7e8 Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f 
am: 6aa436bef2

Change-Id: I994b2fe070091a32beffff9dbf11b907b7878fe8
 2016-12-29 10:13:27 +00:00
Charles He
b64af9bacd Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 
am: d7f2a4b0c7

Change-Id: I3019f9751b69809d3cb66061753f0b76085b235b
 2016-12-29 10:12:24 +00:00
Charles He
00a581f882 Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d 
am: 133ff4d611

Change-Id: I54b163f645f561243aac3df1a55c1023531997b3
 2016-12-29 10:11:20 +00:00
Charles He
6aa436bef2 Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 
am: d0339c6e8f

Change-Id: I0dbec3edf704821eb4605a48b770461eb99ddae7
 2016-12-29 10:06:14 +00:00
Charles He
d7f2a4b0c7 Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 
am: a8484b4f92

Change-Id: Id5a9576ab6e37e3744a59d904909d11f668d0e06
 2016-12-29 10:05:02 +00:00
Charles He
133ff4d611 Prevent writing to FRP partition during factory reset. am: a9437bd1ca 
am: 2ce5c4320d

Change-Id: I29339a634fd22cd46bfc08619464da8fe159a2b7
 2016-12-29 10:03:53 +00:00
Charles He
d0339c6e8f Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. 
am: 71d2a41dd9

Change-Id: Iab575b1efdd720c9cf9e32e0b056c99eff98deab
 2016-12-29 09:50:20 +00:00
Charles He
a8484b4f92 Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev 
am: 4bd97eb888

Change-Id: I607f7ca9e160c4eed69a5baeff6b31d6db7c6b03
 2016-12-29 09:48:50 +00:00
Charles He
2ce5c4320d Prevent writing to FRP partition during factory reset. 
am: a9437bd1ca

Change-Id: Ib0b8db2357317dc3e680910c08f15f098baf2af9
 2016-12-29 09:48:45 +00:00
Charles He
4bd97eb888 Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev 2016-12-29 09:42:30 +00:00
Tom O'Neill
1ac8affd51 Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 am: d28eef0cc2 am: 1f458fdc66 
am: d82f8a67fc

Change-Id: I25e43680e464c5169e8a5b9e8151b0dab2d2cf86
 2016-12-22 17:34:11 +00:00
Tom O'Neill
d82f8a67fc Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 am: d28eef0cc2 
am: 1f458fdc66

Change-Id: I61d4b25ee0264397693f30e2091997c058d0c5fc
 2016-12-22 17:29:05 +00:00
Tom O'Neill
1f458fdc66 Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 
am: d28eef0cc2

Change-Id: If937d91cee2bb06406cf3cd1ae6ac3402a51e88d
 2016-12-22 17:23:39 +00:00
Tom O'Neill
d28eef0cc2 Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b 
am: 1684e5f344

Change-Id: I0ebd2856e2e2f3793273ba952b44dc77e85b021e
 2016-12-22 17:19:10 +00:00
Tom O'Neill
1684e5f344 Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 
am: 0a8978f04b

Change-Id: I693665a57465ec57f946fad57cda9ce48389408f
 2016-12-22 17:14:05 +00:00
Tom O'Neill
0a8978f04b Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 
am: 3380a77516

Change-Id: Ice61f337e1fcfd0569431538e475d94f9d205423
 2016-12-22 17:09:09 +00:00
Tom O'Neill
3380a77516 Fix exploit where can hide the fact that a location was mocked am: a206a0f17e 
am: d417e54872

Change-Id: I2f47020055f962b36f095137d75c9cbfe6b1a6db
 2016-12-22 17:04:07 +00:00
Tom O'Neill
d417e54872 Fix exploit where can hide the fact that a location was mocked 
am: a206a0f17e

Change-Id: Ib3af056919a4b909d3d11dd3fe2b46eaa7cdf0f4
 2016-12-22 16:58:33 +00:00
Tom O'Neill
a206a0f17e Fix exploit where can hide the fact that a location was mocked 
- Even if call setTestProviderLocation() with inconsistent providers,
should still end up with a location that is flagged as mocked

- Bug: 33091107

Change-Id: I39e038f25b975989c2e8651bfd9ec9e74073e6cd
 2016-12-15 10:26:28 -08:00
Julius D'souza
e6f8cb29ec fix case issues with mGoingIdleWakeLock in DeviceIdleController 
Bug: 31900521

Change-Id: I9484b10f0e6b99dfaf11266bb275a31d7ff3868c
 2016-12-14 10:31:12 -08:00
Charles He
71d2a41dd9 Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. 
Change-Id: I1024f2a56badde5c123d025d6fe02f42559cbcb1
Test: manual
Bug: 30352311
(cherry picked from commit f6f1d62748)
 2016-12-14 13:28:55 +00:00
Charles He
a9437bd1ca Prevent writing to FRP partition during factory reset. 
Avoid potential race condition between FRP wipe and write operations
during factory reset by making the FRP partition unwritable after
wipe.

Bug: 30352311
Test: manual
Change-Id: If3f024a1611366c0677a996705724458094fcfad
(cherry picked from commit a629c772f4)
 2016-12-14 12:08:30 +00:00
Julius D'souza
f9f39cc4a8 DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController 
is going idle.

The inputs to DeviceIdleController (alarm manager, sensors)
hold wake locks while they call it.  But then the real work
happens in a handler which is outside of the wakelock, so
listeners don't get a chance to run right away, which in
the case of NetworkPolicyManager means the device is in a
higher power state than it should be.

It's not clear that this will 100% fix the bug, because
NetworkPolicyManagerService also has its own internal
Handler, and isn't holding its own wakelock for this,
but this change allows NPMS to be fixed if it really
needed to be.

Bug: 31900521
Change-Id: I706045aa189147824c9214c57abc13993aee9a5b
 2016-12-13 18:28:31 -08:00
Jeff Sharkey
56247334f8 Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: ae7d4b1339 -s ours am: ce477912a2 am: 920b02a94f -s ours am: aff9286bd6 
am: 37ff2d56bf

Change-Id: I0ff63a0da9300799a8df538fcefaf0d27ea2be00
 2016-12-02 19:13:31 +00:00
Jeff Sharkey
a51ebb828a DO NOT MERGE. Check provider access for content changes. am: 9b85862620 -s ours am: 9277cce7fa am: a1d1ecbe05 -s ours am: 928c09cd8e 
am: 5267b63325

Change-Id: I3cab573840604be9c44e85998c4b1a579d07aee4
 2016-12-02 19:12:33 +00:00
Jeff Sharkey
948841362a Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: 6b89229d14 am: a7efe16fe1 -s ours am: f1085f2dc8 
am: c130d7fd5e

Change-Id: I15e9c5f864ec67c8bf5901fcc46abe0c7b362a6e
 2016-12-02 19:11:29 +00:00
Jeff Sharkey
d081cb0ab7 DO NOT MERGE. Check provider access for content changes. am: 91add43ae7 am: 792d49dfb5 -s ours am: 32af84320b 
am: 8b5fa0c0c0

Change-Id: Ie5bb120bcd900c2032e47f0ae3e1c710c083ae2e
 2016-12-02 19:10:35 +00:00
Jeff Sharkey
37ff2d56bf Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: ae7d4b1339 -s ours am: ce477912a2 am: 920b02a94f -s ours 
am: aff9286bd6

Change-Id: I4f117247986cfa72156d26af917ba1bae6e9fa9b
 2016-12-02 18:56:56 +00:00
Jeff Sharkey
5267b63325 DO NOT MERGE. Check provider access for content changes. am: 9b85862620 -s ours am: 9277cce7fa am: a1d1ecbe05 -s ours 
am: 928c09cd8e

Change-Id: Ic470197dcc815e7ecf6b47dfd74ff6f4f74f1804
 2016-12-02 18:56:01 +00:00
Jeff Sharkey
c130d7fd5e Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: 6b89229d14 am: a7efe16fe1 -s ours 
am: f1085f2dc8

Change-Id: I565994dc5bbfc11b3293cb77aabca77b908a9039
 2016-12-02 18:55:07 +00:00
Jeff Sharkey
8b5fa0c0c0 DO NOT MERGE. Check provider access for content changes. am: 91add43ae7 am: 792d49dfb5 -s ours 
am: 32af84320b

Change-Id: I73fe93944c2c2aebca02ca85d441905c2075bc65
 2016-12-02 18:53:57 +00:00
Jeff Sharkey
aff9286bd6 Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: ae7d4b1339 -s ours am: ce477912a2 
am: 920b02a94f  -s ours

Change-Id: I3c2b9ba49785b40df3960fac4ffb17204cab063a
 2016-12-02 18:40:25 +00:00
Jeff Sharkey
928c09cd8e DO NOT MERGE. Check provider access for content changes. am: 9b85862620 -s ours am: 9277cce7fa 
am: a1d1ecbe05  -s ours

Change-Id: I6d4f8a29537e19545bf94a886aecea8ba05a6de7
 2016-12-02 18:39:20 +00:00
Jeff Sharkey
f1085f2dc8 Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: 6b89229d14 
am: a7efe16fe1  -s ours

Change-Id: I17b84f1e8d8432292568c0adb2b3d89563a72b50
 2016-12-02 18:38:01 +00:00
Jeff Sharkey
44e8914f8b Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 
am: a80cbeeee2

Change-Id: I6b67d2f65208559d9cb5cd79bfec5fbc506abcad
 2016-12-02 18:37:57 +00:00
Jeff Sharkey
74b36307a0 DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 
am: 190e20c2b5

Change-Id: Ib8d8b2b97b03acdd56e2cbdada404fb25535d234
 2016-12-02 18:36:38 +00:00
Jeff Sharkey
32af84320b DO NOT MERGE. Check provider access for content changes. am: 91add43ae7 
am: 792d49dfb5  -s ours

Change-Id: I50ab47cb03b65cc8be78c9a139561e4befbb1a95
 2016-12-02 18:36:33 +00:00
Jeff Sharkey
920b02a94f Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: ae7d4b1339 -s ours 
am: ce477912a2

Change-Id: I1f05c5204e6ba49a95a8b21cb457b04fe6738cb0
 2016-12-02 18:30:18 +00:00
Jeff Sharkey
a1d1ecbe05 DO NOT MERGE. Check provider access for content changes. am: 9b85862620 -s ours 
am: 9277cce7fa

Change-Id: I5cdc35759ad40566c02db6ee725c199ae255b5b8
 2016-12-02 18:29:19 +00:00
Jeff Sharkey
a80cbeeee2 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev 
am: 8e14278209

Change-Id: I31e403ccc5207073d327a144f9b82fb93e01b865
 2016-12-02 18:20:02 +00:00
Jeff Sharkey
a7efe16fe1 Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev 
am: 6b89229d14

Change-Id: I8f09aaed1be7f86cfb0a2cbe91ae5b4fe881df07
 2016-12-02 18:19:56 +00:00
Jeff Sharkey
ce477912a2 Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev 
am: ae7d4b1339  -s ours

Change-Id: Idc5d7d7d695db9ac7e7007447c89ca0466ea158b
 2016-12-02 18:19:53 +00:00
Jeff Sharkey
792d49dfb5 DO NOT MERGE. Check provider access for content changes. 
am: 91add43ae7

Change-Id: I158a5dab0643fb5d2c07393f0df030e93b3c006a
 2016-12-02 18:19:51 +00:00
Jeff Sharkey
190e20c2b5 DO NOT MERGE: Check provider access for content changes. 
am: 4ddbf942a0

Change-Id: I9895591df11a2416cd3191ac9c790ecac167ece5
 2016-12-02 18:19:50 +00:00
Jeff Sharkey
9277cce7fa DO NOT MERGE. Check provider access for content changes. 
am: 9b85862620  -s ours

Change-Id: I2a67bbde8b3e131ba62cedd0b6629912e226ba90
 2016-12-02 18:19:50 +00:00
Jeff Sharkey
471812ad04 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev 
am: 48f6bdfce4

Change-Id: I70a8437a6d5c4b3ed69833a635aa8501ca26a41e
 2016-12-02 18:19:45 +00:00
Jeff Sharkey
7340749c2a DO NOT MERGE: Check provider access for content changes. 
am: ff2fede0dd

Change-Id: I7de766d1acc1f20e83f07953dedfe3810f906db8
 2016-12-02 18:19:42 +00:00