Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
301,953 Commits 3 Branches 0 Tags
ec4e0b075f53ac83cb03db07c00a67ea0f1e3a34
Commit Graph

301953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Charles He
1d84f619bf Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b 
am: 5c74a1e9bb

Change-Id: Ie15d3c1927f17a36ed6d6bbe4b96c986536be3c7
 2016-12-29 10:28:57 +00:00
Charles He
ced5ab190c Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 
am: 0cc0219089

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

Change-Id: I12af619f1fce710f643387dca3e06c1c4b5258d3
 2016-12-29 10:26:51 +00:00
Charles He
9a47fa7fc0 Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 
am: e5156ec1e9

Change-Id: I62b79fe7ef5a2febce27729f4709a599832cb3da
 2016-12-29 10:25:50 +00:00
Charles He
5c74a1e9bb Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad 
am: f027831c6b

Change-Id: I49d10d41d5b89c97a2f418ccaed44eeae720bb22
 2016-12-29 10:21:47 +00:00
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
Ivan Podogov
895e2d7a40 Merge "In permission review mode, always request user's consent to toggle BT." 2016-12-29 10:18:11 +00:00
Charles He
f027831c6b Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d 
am: a1d59972ad

Change-Id: I027ab6594b563204515677fca9c256251b7067cd
 2016-12-29 10:14:26 +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
a1d59972ad Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b 
am: 1422a6074d

Change-Id: I2f3bf02f57c5f00964e645321467977b4ef498a7
 2016-12-29 10:07: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
1422a6074d Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev 
am: 63a27d773b

Change-Id: I01d332678c1c3fe57ed36062a9ed01b5f368a55d
 2016-12-29 09:50:26 +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
63a27d773b Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev 2016-12-29 09:43:14 +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
Martijn Coenen
872a5c0cdf Merge "Add (un)linkToDeath support to HwBinder." am: 7705363166 am: 010d0be575 am: 1f8c96ca7f 
am: c052e6c67f

Change-Id: I5b515db7eaeac33a9072e6046f4c5bb948d5aa39
 2016-12-29 09:27:24 +00:00
Martijn Coenen
c052e6c67f Merge "Add (un)linkToDeath support to HwBinder." am: 7705363166 am: 010d0be575 
am: 1f8c96ca7f

Change-Id: Ic195a1f3ab2a9d318fe667ac3be0ce166119dc66
 2016-12-29 09:19:55 +00:00
Martijn Coenen
1f8c96ca7f Merge "Add (un)linkToDeath support to HwBinder." am: 7705363166 
am: 010d0be575

Change-Id: Ibabccaf8555bd0229add18a798bff685c6a1c433
 2016-12-29 09:12:22 +00:00
Martijn Coenen
010d0be575 Merge "Add (un)linkToDeath support to HwBinder." 
am: 7705363166

Change-Id: I007b2fc2982d164176607cd8f2d0ccc9ebde982c
 2016-12-29 09:04:49 +00:00
Martijn Coenen
7705363166 Merge "Add (un)linkToDeath support to HwBinder." 2016-12-29 08:07:45 +00:00
Martijn Coenen
727f7bf84f Add (un)linkToDeath support to HwBinder. 
This is mostly copied over from binder's existing
death recipient support. The implementation keeps
a list of registered recipients, both for being
able to map a native recipient back to the corresponding
Java recipient, as well as being able to unregister
recipients correctly.

Test: mma, hidl_test_java
Bug: 31632518
Change-Id: Id313fd248be6925056c4ade8298fe5fb04e007cc
 2016-12-29 04:22:30 +00:00
ashutoshj
a9ceb9ebac Merge "Merge "Change the name of the contexthub service." am: fba752e64c am: 8a3f7c0738 am: cf33fd7910" into nyc-mr2-dev-plus-aosp 
am: ef5d594abb  -s ours

Change-Id: Ib00d39fe1102bbe95171620420dc1016f02502dc
 2016-12-29 02:00:03 +00:00
ashutoshj
49750a0448 Merge "Change the name of the contexthub service." am: fba752e64c am: 8a3f7c0738 am: cf33fd7910 
am: 3659363d06  -s ours

Change-Id: I40d4f12980f2068e1ad81d1c69ef0bb0489dcc80
 2016-12-29 01:59:48 +00:00
Jiaquan He
5489638035 Merge "Move grid checking into the layout algorithm." into nyc-mr2-dev am: c87fcb0963 
am: b0ff5e511a

Change-Id: Ieb4f9a723215946835c0a9448c8cac464a6ffc0c
 2016-12-29 01:58:26 +00:00
Jiaquan He
71cfaee778 Move grid checking into the layout algorithm. am: 26f637b555 
am: c29cd0fdca

Change-Id: Icf69a78743697daaad7e55ca6116d24f716c88ef
 2016-12-29 01:57:24 +00:00
Android Build Merger (Role)
ef5d594abb Merge "Merge "Change the name of the contexthub service." am: fba752e64c am: 8a3f7c0738 am: cf33fd7910" into nyc-mr2-dev-plus-aosp 2016-12-29 01:53:37 +00:00
ashutoshj
3659363d06 Merge "Change the name of the contexthub service." am: fba752e64c am: 8a3f7c0738 
am: cf33fd7910

Change-Id: Ic9daa912077d6162092a0adcb5d8debf10be9c55
 2016-12-29 01:52:34 +00:00
Jiaquan He
b0ff5e511a Merge "Move grid checking into the layout algorithm." into nyc-mr2-dev 
am: c87fcb0963

Change-Id: I5f2a91b5f52f2dd3ebc564c127a1f939a4bc20a4
 2016-12-29 01:51:30 +00:00
Jiaquan He
c29cd0fdca Move grid checking into the layout algorithm. 
am: 26f637b555

Change-Id: Ie65d71bd7f6edb5e92f6dd331999424a592c8073
 2016-12-29 01:51:24 +00:00
ashutoshj
cf33fd7910 Merge "Change the name of the contexthub service." am: fba752e64c 
am: 8a3f7c0738

Change-Id: I02265e27f7245a13cdfc705dba4cd4de33ed0253
 2016-12-29 01:45:34 +00:00
TreeHugger Robot
c87fcb0963 Merge "Move grid checking into the layout algorithm." into nyc-mr2-dev 2016-12-29 01:41:56 +00:00
ashutoshj
8a3f7c0738 Merge "Change the name of the contexthub service." 
am: fba752e64c

Change-Id: Ie354f06495f0c3fb73aa053956ecc371716bab3f
 2016-12-29 01:38:30 +00:00
ashutoshj
fba752e64c Merge "Change the name of the contexthub service." 2016-12-29 01:29:41 +00:00
TreeHugger Robot
77447de5d5 Merge "New permission - BIND_NETWORK_RECOMMENDATION_SERVICE." 2016-12-29 01:20:48 +00:00
TreeHugger Robot
7a7ff80c68 Merge "Don't allow permission change to runtime" 2016-12-29 01:13:09 +00:00
Jiaquan He
3c48ee93ab Merge "2D recents: show all close buttons right away" into nyc-mr2-dev am: 3b430f7d0c 
am: 5338939948

Change-Id: I0f841dbfe75879bb5fef09eff038b46ea0b38897
 2016-12-29 00:30:02 +00:00
Manu Cornet
fc16b764b6 2D recents: show all close buttons right away am: 8ff7854c4b 
am: ca0e55646b

Change-Id: I42325561cc94f816701f4c9cd3edaca31efd5a22
 2016-12-29 00:28:55 +00:00
Jiaquan He
55b9008e33 Merge "2D Recents: use a slightly darker scrim background" into nyc-mr2-dev am: 55a684ff65 
am: fe50c6c21f

Change-Id: Ie0b5f90d34a61266191ea330f28b8fdd8bf62063
 2016-12-29 00:27:51 +00:00
Manu Cornet
9577cb827a 2D Recents: use a slightly darker scrim background am: 48de4e6afe 
am: bec5fee38d

Change-Id: Id67d6d2cbc81588dd6163cfbc25d6ff9f073e08a
 2016-12-29 00:26:45 +00:00
Jiaquan He
5338939948 Merge "2D recents: show all close buttons right away" into nyc-mr2-dev 
am: 3b430f7d0c

Change-Id: I816b8170fef81e02d2c9fc99ba0f236d7f2cf080
 2016-12-29 00:21:55 +00:00
Manu Cornet
ca0e55646b 2D recents: show all close buttons right away 
am: 8ff7854c4b

Change-Id: I18e3729f5e09601a6548647fa16ba90bf2147cb0
 2016-12-29 00:21:48 +00:00
Jiaquan He
fe50c6c21f Merge "2D Recents: use a slightly darker scrim background" into nyc-mr2-dev 
am: 55a684ff65

Change-Id: Ife9a1c5276668ceddc662fdc2e385b7f0570b660
 2016-12-29 00:19:53 +00:00