OSDN Git Service
Charles He [Thu, 29 Dec 2016 11:38:32 +0000 (11:38 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882 am:
e5156ec1e9 am:
9a47fa7fc0 am:
8bcdab7e6f am:
dd7837c5ad am:
9bc2d6b446 am:
08ea823955 am:
22faa73586
am:
503794154d
Change-Id: Ie906f7470d28a32e1f3cb3fcd1918f3ad47fe5e1
Charles He [Thu, 29 Dec 2016 11:37:01 +0000 (11:37 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882 am:
e5156ec1e9 am:
9a47fa7fc0 am:
8bcdab7e6f am:
dd7837c5ad am:
9bc2d6b446 am:
08ea823955 am:
065e387455
am:
fce4eb6810
Change-Id: I87a2d4fbeed47094cc27967b13e1950b3dedaf0e
Charles He [Thu, 29 Dec 2016 11:24:10 +0000 (11:24 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882 am:
e5156ec1e9 am:
9a47fa7fc0 am:
8bcdab7e6f am:
dd7837c5ad am:
9bc2d6b446 am:
08ea823955
am:
22faa73586
Change-Id: I630b97aa9b3a5e9bbc88b49aeb61216ff9c37de6
Charles He [Thu, 29 Dec 2016 11:23:57 +0000 (11:23 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882 am:
e5156ec1e9 am:
9a47fa7fc0 am:
8bcdab7e6f am:
dd7837c5ad am:
9bc2d6b446 am:
08ea823955
am:
065e387455
Change-Id: Ic6182836cbc0bf547bcd6c6621a410c1e6d0ce8f
Ivan Podogov [Thu, 29 Dec 2016 11:23:55 +0000 (11:23 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT." am:
895e2d7a40 -s ours am:
fd770e1cb8 am:
b90fa0a5c3
am:
04a20f695d
Change-Id: I0633c7bf53319571af5a746725cdee5ad4b225ae
Charles He [Thu, 29 Dec 2016 11:17:05 +0000 (11:17 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882 am:
e5156ec1e9 am:
9a47fa7fc0 am:
8bcdab7e6f am:
dd7837c5ad am:
9bc2d6b446
am:
08ea823955
Change-Id: I1526deabd38ef8ecbb841a7029b9539bb5f3aefc
Charles He [Thu, 29 Dec 2016 11:16:55 +0000 (11:16 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882 am:
e5156ec1e9 am:
9a47fa7fc0 am:
8bcdab7e6f am:
dd7837c5ad am:
9bc2d6b446
am:
08ea823955
Change-Id: I079501cac553468878a6642a64110f4de3e56698
Ivan Podogov [Thu, 29 Dec 2016 11:16:50 +0000 (11:16 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT." am:
895e2d7a40 -s ours am:
fd770e1cb8
am:
b90fa0a5c3
Change-Id: Id527fe8b5242ae6650446ce2993708463c08323b
Ivan Podogov [Thu, 29 Dec 2016 11:10:29 +0000 (11:10 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT." am:
895e2d7a40 -s ours
am:
fd770e1cb8
Change-Id: Icef54e7756a1b9b63f909ea8011a2625df38df99
Charles He [Thu, 29 Dec 2016 11:03:26 +0000 (11:03 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882 am:
e5156ec1e9 am:
9a47fa7fc0 am:
8bcdab7e6f am:
dd7837c5ad
am:
9bc2d6b446
Change-Id: I7e5794885bf78dfd1d755a7fdb0b1edf66b9fdee
Ivan Podogov [Thu, 29 Dec 2016 11:03:21 +0000 (11:03 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT."
am:
895e2d7a40 -s ours
Change-Id: Id2deabb5875b0ca13bb818a7c65893e01dc655e2
Charles He [Thu, 29 Dec 2016 10:55:23 +0000 (10:55 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882 am:
e5156ec1e9 am:
9a47fa7fc0 am:
8bcdab7e6f
am:
dd7837c5ad
Change-Id: I2124f52b38314199950d1448cddd2bbd328c85ce
Charles He [Thu, 29 Dec 2016 10:41:25 +0000 (10:41 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882 am:
e5156ec1e9 am:
9a47fa7fc0
am:
8bcdab7e6f
Change-Id: I6e41bfad4ce66ca80bca636a5fb4ddc85b71e83a
Charles He [Thu, 29 Dec 2016 10:34:04 +0000 (10:34 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882 am:
e5156ec1e9
am:
9a47fa7fc0
Change-Id: Ifb9f5b177f7c031352e6e9cf308e6295f7c60074
Charles He [Thu, 29 Dec 2016 10:25:50 +0000 (10:25 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882
am:
e5156ec1e9
Change-Id: I62b79fe7ef5a2febce27729f4709a599832cb3da
Charles He [Thu, 29 Dec 2016 10:18:49 +0000 (10:18 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611
am:
00a581f882
Change-Id: I016955744e48d7a91380c2ff39f7c64536a39c7e
Ivan Podogov [Thu, 29 Dec 2016 10:18:10 +0000 (10:18 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT."
Charles He [Thu, 29 Dec 2016 10:11:20 +0000 (10:11 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d
am:
133ff4d611
Change-Id: I54b163f645f561243aac3df1a55c1023531997b3
Charles He [Thu, 29 Dec 2016 10:03:53 +0000 (10:03 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca
am:
2ce5c4320d
Change-Id: I29339a634fd22cd46bfc08619464da8fe159a2b7
Charles He [Thu, 29 Dec 2016 09:48:45 +0000 (09:48 +0000)]
Prevent writing to FRP partition during factory reset.
am:
a9437bd1ca
Change-Id: Ib0b8db2357317dc3e680910c08f15f098baf2af9
Martijn Coenen [Thu, 29 Dec 2016 09:27:24 +0000 (09:27 +0000)]
Merge "Add (un)linkToDeath support to HwBinder." am:
7705363166 am:
010d0be575 am:
1f8c96ca7f
am:
c052e6c67f
Change-Id: I5b515db7eaeac33a9072e6046f4c5bb948d5aa39
Martijn Coenen [Thu, 29 Dec 2016 09:19:55 +0000 (09:19 +0000)]
Merge "Add (un)linkToDeath support to HwBinder." am:
7705363166 am:
010d0be575
am:
1f8c96ca7f
Change-Id: Ic195a1f3ab2a9d318fe667ac3be0ce166119dc66
Martijn Coenen [Thu, 29 Dec 2016 09:12:22 +0000 (09:12 +0000)]
Merge "Add (un)linkToDeath support to HwBinder." am:
7705363166
am:
010d0be575
Change-Id: Ibabccaf8555bd0229add18a798bff685c6a1c433
Martijn Coenen [Thu, 29 Dec 2016 09:04:49 +0000 (09:04 +0000)]
Merge "Add (un)linkToDeath support to HwBinder."
am:
7705363166
Change-Id: I007b2fc2982d164176607cd8f2d0ccc9ebde982c
Martijn Coenen [Thu, 29 Dec 2016 08:07:44 +0000 (08:07 +0000)]
Merge "Add (un)linkToDeath support to HwBinder."
Martijn Coenen [Tue, 27 Dec 2016 13:33:09 +0000 (14:33 +0100)]
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
ashutoshj [Thu, 29 Dec 2016 02:00:03 +0000 (02:00 +0000)]
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
ashutoshj [Thu, 29 Dec 2016 01:59:48 +0000 (01:59 +0000)]
Merge "Change the name of the contexthub service." am:
fba752e64c am:
8a3f7c0738 am:
cf33fd7910
am:
3659363d06 -s ours
Change-Id: I40d4f12980f2068e1ad81d1c69ef0bb0489dcc80
Jiaquan He [Thu, 29 Dec 2016 01:58:26 +0000 (01:58 +0000)]
Merge "Move grid checking into the layout algorithm." into nyc-mr2-dev am:
c87fcb0963
am:
b0ff5e511a
Change-Id: Ieb4f9a723215946835c0a9448c8cac464a6ffc0c
Jiaquan He [Thu, 29 Dec 2016 01:57:24 +0000 (01:57 +0000)]
Move grid checking into the layout algorithm. am:
26f637b555
am:
c29cd0fdca
Change-Id: Icf69a78743697daaad7e55ca6116d24f716c88ef
Android Build Merger (Role) [Thu, 29 Dec 2016 01:53:33 +0000 (01:53 +0000)]
Merge "Merge "Change the name of the contexthub service." am:
fba752e64c am:
8a3f7c0738 am:
cf33fd7910" into nyc-mr2-dev-plus-aosp
ashutoshj [Thu, 29 Dec 2016 01:52:34 +0000 (01:52 +0000)]
Merge "Change the name of the contexthub service." am:
fba752e64c am:
8a3f7c0738
am:
cf33fd7910
Change-Id: Ic9daa912077d6162092a0adcb5d8debf10be9c55
Jiaquan He [Thu, 29 Dec 2016 01:51:30 +0000 (01:51 +0000)]
Merge "Move grid checking into the layout algorithm." into nyc-mr2-dev
am:
c87fcb0963
Change-Id: I5f2a91b5f52f2dd3ebc564c127a1f939a4bc20a4
Jiaquan He [Thu, 29 Dec 2016 01:51:24 +0000 (01:51 +0000)]
Move grid checking into the layout algorithm.
am:
26f637b555
Change-Id: Ie65d71bd7f6edb5e92f6dd331999424a592c8073
ashutoshj [Thu, 29 Dec 2016 01:45:34 +0000 (01:45 +0000)]
Merge "Change the name of the contexthub service." am:
fba752e64c
am:
8a3f7c0738
Change-Id: I02265e27f7245a13cdfc705dba4cd4de33ed0253
TreeHugger Robot [Thu, 29 Dec 2016 01:41:52 +0000 (01:41 +0000)]
Merge "Move grid checking into the layout algorithm." into nyc-mr2-dev
ashutoshj [Thu, 29 Dec 2016 01:38:30 +0000 (01:38 +0000)]
Merge "Change the name of the contexthub service."
am:
fba752e64c
Change-Id: Ie354f06495f0c3fb73aa053956ecc371716bab3f
ashutoshj [Thu, 29 Dec 2016 01:29:41 +0000 (01:29 +0000)]
Merge "Change the name of the contexthub service."
TreeHugger Robot [Thu, 29 Dec 2016 01:20:45 +0000 (01:20 +0000)]
Merge "New permission - BIND_NETWORK_RECOMMENDATION_SERVICE."
TreeHugger Robot [Thu, 29 Dec 2016 01:13:05 +0000 (01:13 +0000)]
Merge "Don't allow permission change to runtime"
Jiaquan He [Thu, 29 Dec 2016 00:30:02 +0000 (00:30 +0000)]
Merge "2D recents: show all close buttons right away" into nyc-mr2-dev am:
3b430f7d0c
am:
5338939948
Change-Id: I0f841dbfe75879bb5fef09eff038b46ea0b38897
Manu Cornet [Thu, 29 Dec 2016 00:28:55 +0000 (00:28 +0000)]
2D recents: show all close buttons right away am:
8ff7854c4b
am:
ca0e55646b
Change-Id: I42325561cc94f816701f4c9cd3edaca31efd5a22
Jiaquan He [Thu, 29 Dec 2016 00:27:51 +0000 (00:27 +0000)]
Merge "2D Recents: use a slightly darker scrim background" into nyc-mr2-dev am:
55a684ff65
am:
fe50c6c21f
Change-Id: Ie0b5f90d34a61266191ea330f28b8fdd8bf62063
Manu Cornet [Thu, 29 Dec 2016 00:26:45 +0000 (00:26 +0000)]
2D Recents: use a slightly darker scrim background am:
48de4e6afe
am:
bec5fee38d
Change-Id: Id67d6d2cbc81588dd6163cfbc25d6ff9f073e08a
Jiaquan He [Thu, 29 Dec 2016 00:21:55 +0000 (00:21 +0000)]
Merge "2D recents: show all close buttons right away" into nyc-mr2-dev
am:
3b430f7d0c
Change-Id: I816b8170fef81e02d2c9fc99ba0f236d7f2cf080
Manu Cornet [Thu, 29 Dec 2016 00:21:48 +0000 (00:21 +0000)]
2D recents: show all close buttons right away
am:
8ff7854c4b
Change-Id: I18e3729f5e09601a6548647fa16ba90bf2147cb0
Jiaquan He [Thu, 29 Dec 2016 00:19:53 +0000 (00:19 +0000)]
Merge "2D Recents: use a slightly darker scrim background" into nyc-mr2-dev
am:
55a684ff65
Change-Id: Ife9a1c5276668ceddc662fdc2e385b7f0570b660
Manu Cornet [Thu, 29 Dec 2016 00:19:48 +0000 (00:19 +0000)]
2D Recents: use a slightly darker scrim background
am:
48de4e6afe
Change-Id: I33a961dbd1741d72fa86a0cde0b2e60b76271955
Jiaquan He [Thu, 29 Dec 2016 00:13:14 +0000 (00:13 +0000)]
Merge "2D recents: show all close buttons right away" into nyc-mr2-dev
Jiaquan He [Thu, 29 Dec 2016 00:12:48 +0000 (00:12 +0000)]
Merge "2D Recents: use a slightly darker scrim background" into nyc-mr2-dev
Jiaquan He [Thu, 29 Dec 2016 00:08:33 +0000 (00:08 +0000)]
Merge "Merge "Resue TaskView information." into nyc-mr2-dev am:
6335e35d51" into nyc-mr2-dev-plus-aosp
am:
31ebbf40bc
Change-Id: I340049bc897dc760cdf25a87c817c41c1f64fdc4
Jiaquan He [Thu, 29 Dec 2016 00:08:27 +0000 (00:08 +0000)]
Merge "Resue TaskView information." into nyc-mr2-dev am:
6335e35d51
am:
e0133206d3
Change-Id: I21dd96e8bdf12845c8f9308cae51af8851f280c2
Jiaquan He [Tue, 27 Dec 2016 22:44:14 +0000 (14:44 -0800)]
Move grid checking into the layout algorithm.
We move grid layout checking into the layout algorithm, so that we can
hide more computation from the views.
Bug:
32101881
Change-Id: I174fe33ef7ed3c04987771dbb42d831a4b9bdab2
Jiaquan He [Thu, 29 Dec 2016 00:06:39 +0000 (00:06 +0000)]
Merge "Resue TaskView information. am:
0a5e2d6b93" into nyc-mr2-dev-plus-aosp
am:
a1ac1af80f
Change-Id: I6d3a6a0be887b4ec7269e77c32c617079c42c345
Jiaquan He [Thu, 29 Dec 2016 00:06:31 +0000 (00:06 +0000)]
Resue TaskView information. am:
0a5e2d6b93
am:
e6dd53291e
Change-Id: Iedf5472abf2cf11ce0b9ad1f83224adbfda144ff
Adrian Roos [Thu, 29 Dec 2016 00:05:22 +0000 (00:05 +0000)]
Merge "QS - Fix race condition in accessibility" am:
302efd6125 am:
3c0a8bba3c am:
b12ed1e10f
am:
0a4e1b7078
Change-Id: I1409cc428b41b01ffb1461f011337a7cbe409b46
Android Build Merger (Role) [Thu, 29 Dec 2016 00:00:21 +0000 (00:00 +0000)]
Merge "Merge "Resue TaskView information." into nyc-mr2-dev am:
6335e35d51" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Wed, 28 Dec 2016 23:59:54 +0000 (23:59 +0000)]
Merge "Resue TaskView information. am:
0a5e2d6b93" into nyc-mr2-dev-plus-aosp
Jiaquan He [Wed, 28 Dec 2016 23:58:54 +0000 (23:58 +0000)]
Merge "Resue TaskView information." into nyc-mr2-dev
am:
6335e35d51
Change-Id: I6498fbdb0c948913da95a5beccaa9feeb5f8f1ed
Jiaquan He [Wed, 28 Dec 2016 23:58:49 +0000 (23:58 +0000)]
Resue TaskView information.
am:
0a5e2d6b93
Change-Id: I0d998b0e31dedb48ef284386811fe67fbda6c981
Adrian Roos [Wed, 28 Dec 2016 23:58:43 +0000 (23:58 +0000)]
Merge "QS - Fix race condition in accessibility" am:
302efd6125 am:
3c0a8bba3c
am:
b12ed1e10f
Change-Id: I2f17f2bd2f293f2c68ba20fbfd6aa3e693f8b865
Adrian Roos [Wed, 28 Dec 2016 23:51:30 +0000 (23:51 +0000)]
Merge "QS - Fix race condition in accessibility" am:
302efd6125
am:
3c0a8bba3c
Change-Id: I3e05c8c127c021dc321b0ef130159ff7a021a9e8
TreeHugger Robot [Wed, 28 Dec 2016 23:50:52 +0000 (23:50 +0000)]
Merge "Resue TaskView information." into nyc-mr2-dev
Adrian Roos [Wed, 28 Dec 2016 23:43:46 +0000 (23:43 +0000)]
Merge "QS - Fix race condition in accessibility"
am:
302efd6125
Change-Id: I13c4959fde96684c52124ff8809d6921fc404a42
Svetoslav Ganov [Wed, 28 Dec 2016 02:55:29 +0000 (18:55 -0800)]
Don't allow permission change to runtime
Prevent apps to change permission protection level to dangerous
from any other type as this would allow a privilege escalation
where an app adds a normal permission in other app's group and
then redefines it as dangerous leading to the group auto-grant.
Test: Added a CTS test which passes.
bug:
33860747
Change-Id: I1ccf546f78ee79ff027cb98124be81c8e5265a82
Adrian Roos [Wed, 28 Dec 2016 23:29:58 +0000 (23:29 +0000)]
Merge "QS - Fix race condition in accessibility"
Ashutosh Joshi [Wed, 28 Dec 2016 21:59:34 +0000 (21:59 +0000)]
Merge "Change the name of the contexthub service."
Ashutosh Joshi [Tue, 27 Dec 2016 17:32:49 +0000 (09:32 -0800)]
Change the name of the contexthub service.
Change the name used by the contexthub service. Specifically, this
change switches from using the "ContexthubService.CONTEXTHUB_SERVICE"
constant to using the "Context.CONTEXTHUB_SERVICE" constant- which is in
line with the other Android services.
Merged-In: I18ae73ed0fda2f938e3233670dc52b5692d321ae
Test: GTS tests pass.
Change-Id: I18ae73ed0fda2f938e3233670dc52b5692d321ae
Ashutosh Joshi [Tue, 27 Dec 2016 17:32:49 +0000 (09:32 -0800)]
Change the name of the contexthub service.
Change the name used by the contexthub service. Specifically, this
change switches from using the "ContexthubService.CONTEXTHUB_SERVICE"
constant to using the "Context.CONTEXTHUB_SERVICE" constant- which is in
line with the other Android services.
Test: GTS tests pass.
Change-Id: I18ae73ed0fda2f938e3233670dc52b5692d321ae
Andrew Solovay [Wed, 28 Dec 2016 20:52:11 +0000 (20:52 +0000)]
Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev am:
61dad4b2fc am:
897df2b5af am:
602c3c7073
am:
eb609a3d0f
Change-Id: Iddd98eec069c710ca4e86cf4ef98817d81edda0e
Andrew Solovay [Wed, 28 Dec 2016 20:51:06 +0000 (20:51 +0000)]
[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported. am:
40ba793b33 am:
2891357f4d am:
23473e8851
am:
3a623dcd7d
Change-Id: I13d01d6962a6f77877ea882f6630dcfb10c58b56
Andrew Solovay [Wed, 28 Dec 2016 20:46:15 +0000 (20:46 +0000)]
Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev am:
61dad4b2fc am:
897df2b5af am:
563ca19747
am:
75a9407af6
Change-Id: I5f632d147c7b83cf5f375da572e269ce13626ce4
Andrew Solovay [Wed, 28 Dec 2016 20:45:39 +0000 (20:45 +0000)]
Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev am:
61dad4b2fc am:
897df2b5af
am:
602c3c7073
Change-Id: I496cfe09a488f9bfc278e10e72423da3e2406c6f
Andrew Solovay [Wed, 28 Dec 2016 20:44:54 +0000 (20:44 +0000)]
[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported. am:
40ba793b33 am:
2891357f4d am:
ff501e5e5f
am:
88addedb34
Change-Id: Ic38830c87084c6fc7237f290f8167324744c12d0
Andrew Solovay [Wed, 28 Dec 2016 20:44:32 +0000 (20:44 +0000)]
[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported. am:
40ba793b33 am:
2891357f4d
am:
23473e8851
Change-Id: Id8590431f317068e0f851f0b77862b825734eae6
Andrii Kulian [Wed, 28 Dec 2016 20:41:30 +0000 (20:41 +0000)]
Merge changes I2ac2cdba,I6ade7874
* changes:
Fix crash when removing a display with activities
Add positionChildAt method to WindowContainer
Andrew Solovay [Wed, 28 Dec 2016 20:38:40 +0000 (20:38 +0000)]
Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev am:
61dad4b2fc am:
897df2b5af
am:
563ca19747
Change-Id: I133647a253f62208c7ee6deb6cf15a955f09ec8e
Andrew Solovay [Wed, 28 Dec 2016 20:37:36 +0000 (20:37 +0000)]
[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported. am:
40ba793b33 am:
2891357f4d
am:
ff501e5e5f
Change-Id: I8e7bf9b66c92ed5db45007084075fca36ccaa0c8
Andrew Solovay [Wed, 28 Dec 2016 20:32:13 +0000 (20:32 +0000)]
Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev am:
61dad4b2fc
am:
897df2b5af
Change-Id: I06cea8a7d84e02346047e0e0bf88cf30f9da4120
Andrew Solovay [Wed, 28 Dec 2016 20:32:03 +0000 (20:32 +0000)]
Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev am:
61dad4b2fc
am:
897df2b5af
Change-Id: I32b241e93caac5e38c54610b799c877365be75ff
Jeremy Joslin [Wed, 28 Dec 2016 18:32:46 +0000 (10:32 -0800)]
New permission - BIND_NETWORK_RECOMMENDATION_SERVICE.
Used to protect exported network recommendation services.
Test: Built & ran
BUG:
33897544
Change-Id: I4f163fb965be6a25201bc3ba5e0032e7652c8f20
Andrew Solovay [Wed, 28 Dec 2016 20:31:08 +0000 (20:31 +0000)]
[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported. am:
40ba793b33
am:
2891357f4d
Change-Id: Id95f2f8c11a98b56f656b3688accd632fe6da43d
Andrew Solovay [Wed, 28 Dec 2016 20:31:02 +0000 (20:31 +0000)]
[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported. am:
40ba793b33
am:
2891357f4d
Change-Id: I9b15c8787d6f6aa6c2d362de46ab06a583d3283c
Jeremy Joslin [Wed, 28 Dec 2016 20:24:42 +0000 (20:24 +0000)]
Merge "Cleanup the evaluateBinding() method." am:
c26aa87a2b am:
b12af1b18a am:
3ba918c9d3
am:
7a93f7e661 -s ours
Change-Id: Id9f9eb8407047e4613540da349753a1a6595dca9
Andrew Solovay [Wed, 28 Dec 2016 20:24:34 +0000 (20:24 +0000)]
Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev
am:
61dad4b2fc
Change-Id: I1918b70ad644f7aded33d27bcc55e05478d9f773
Andrew Solovay [Wed, 28 Dec 2016 20:24:30 +0000 (20:24 +0000)]
[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported.
am:
40ba793b33
Change-Id: I5d15df8192fee8362dca8dcc53d84b75af29a13f
Jeremy Joslin [Wed, 28 Dec 2016 20:17:35 +0000 (20:17 +0000)]
Merge "Cleanup the evaluateBinding() method." am:
c26aa87a2b am:
b12af1b18a
am:
3ba918c9d3
Change-Id: I72485ebbaed2b60b48d1b4694b0db56b9f2178ca
Andrew Solovay [Wed, 28 Dec 2016 20:16:26 +0000 (20:16 +0000)]
Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev
Jeremy Joslin [Wed, 28 Dec 2016 20:10:35 +0000 (20:10 +0000)]
Merge "Cleanup the evaluateBinding() method." am:
c26aa87a2b
am:
b12af1b18a
Change-Id: I65d005aa303102b212c93b0b2702941bf554526d
Jeremy Joslin [Wed, 28 Dec 2016 20:03:05 +0000 (20:03 +0000)]
Merge "Cleanup the evaluateBinding() method."
am:
c26aa87a2b
Change-Id: Iaac51cf5114ed6af55246b3580b9f5403a1bb3bd
Treehugger Robot [Wed, 28 Dec 2016 19:52:41 +0000 (19:52 +0000)]
Merge "Cleanup the evaluateBinding() method."
TreeHugger Robot [Wed, 28 Dec 2016 19:29:18 +0000 (19:29 +0000)]
Merge "AAPT2: Treat non-AAPT attributes as Attributes with no format specified."
Jiaquan He [Wed, 28 Dec 2016 19:28:10 +0000 (19:28 +0000)]
Merge "Check split screen properly." into nyc-mr2-dev am:
632332c259
am:
bec9df8060
Change-Id: Ieed1829265dbdd6c079a3f8d18ead3784790a275
Jiaquan He [Wed, 28 Dec 2016 19:26:59 +0000 (19:26 +0000)]
Check split screen properly. am:
5fac212e8b
am:
e3ecb097b0
Change-Id: Ic534ab1ef2c6c0067e1d43f31b662ea23e221e8d
Jiaquan He [Wed, 28 Dec 2016 19:20:06 +0000 (19:20 +0000)]
Merge "Check split screen properly." into nyc-mr2-dev
am:
632332c259
Change-Id: I2d69e69b9e00d076f2707a690137d5278fd2107c
Jiaquan He [Wed, 28 Dec 2016 19:20:00 +0000 (19:20 +0000)]
Check split screen properly.
am:
5fac212e8b
Change-Id: Ica99e37798a2447acdbddb7b29b6e67655870b1d
Jiaquan He [Wed, 28 Dec 2016 19:12:23 +0000 (19:12 +0000)]
Merge "Check split screen properly." into nyc-mr2-dev
Jeremy Joslin [Wed, 21 Dec 2016 21:35:02 +0000 (13:35 -0800)]
Cleanup the evaluateBinding() method.
Small refactor to remove 1 level of nesting.
Test: build, run.
Change-Id: Ic46a65036b207ff73fefced914e0928de2f2b500
Merged-In: I38836ca9d18c5fcd3c6edf5931b58de3b08614ee
Adam Lesinski [Wed, 28 Dec 2016 17:25:46 +0000 (12:25 -0500)]
AAPT2: Treat non-AAPT attributes as Attributes with no format specified.
Attributes in XML like "class" should be treated as attributes with no
format specified. That means that something like 'version="1"' will
be interpreted as an Integer value instead of as a string.
This is more in line with the old AAPT behaviour.
Bug:
30763349
Test: make libaapt2_tests
Change-Id: I02fe41617e3c62c354714056198ef480d62afee7
Jorim Jaggi [Wed, 28 Dec 2016 17:21:04 +0000 (17:21 +0000)]
Merge "Change screen pinning back to old gesture" into nyc-mr2-dev am:
8812fb0695
am:
3b03622406 -s ours
Change-Id: I6dfdf86c11ef17a3cc2d09c7b68486452f5401cc
OSDN Git Service
