297749 Commits

Author SHA1 Message Date
Jeff Sharkey
b6ced762ed Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470 am: 8c74832d5e am: 07ad2a9063 am: a75ce3a705 am: b46e9bb9cb
am: fc532f77fc  -s ours

Change-Id: I485f0bcc55613495a3278bf84f21baee63435435
2016-12-02 20:22:12 +00:00
Jeff Sharkey
df8c02566d Merge "DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac am: 10cdb1130e am: 45ba8593c0" into nyc-mr2-dev-plus-aosp
am: 545b2f2083  -s ours

Change-Id: I35712adaaaf8bfb9cdec9d524fdb1b5099986ef7
2016-12-02 20:20:36 +00:00
Jeff Sharkey
94169a7536 DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac am: 10cdb1130e am: 45ba8593c0
am: 736acb1073  -s ours

Change-Id: I72c690f9cb77178dacb78abe8754eb5656b352e5
2016-12-02 20:20:30 +00:00
Jeff Sharkey
e4563c78e8 Merge "DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac am: 10cdb1130e am: dd09c12a61" into nyc-mr2-dev-plus-aosp
am: c91876dcf3  -s ours

Change-Id: I43f0b24f245d56ef3a49a716d9dffffe70da1ae9
2016-12-02 20:18:50 +00:00
Jeff Sharkey
24cc84c835 DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac am: 10cdb1130e am: dd09c12a61
am: e98f3f4d08  -s ours

Change-Id: Ib7f656cbbfdfb6332583fb750444dcb974f33a5f
2016-12-02 20:18:44 +00:00
Jaekyun Seok
c9770fed47 Merge "Remove static link in Android framework under /frameworks/base." am: c60963e451 am: 5705ad69db am: ae21f6f5b0
am: 195caa6696  -s ours

Change-Id: If30455d6043d7e63e48bf2773198bd80f2524937
2016-12-02 20:17:37 +00:00
TreeHugger Robot
0730df7369 Merge "Allow some app windows to display above the IME." 2016-12-02 19:55:52 +00:00
Android Build Merger (Role)
545b2f2083 Merge "DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac am: 10cdb1130e am: 45ba8593c0" into nyc-mr2-dev-plus-aosp 2016-12-02 19:53:42 +00:00
Jeff Sharkey
fc532f77fc Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470 am: 8c74832d5e am: 07ad2a9063 am: a75ce3a705
am: b46e9bb9cb

Change-Id: I68c9a03a42a89530aeadc25aa601bbdef7ebc78c
2016-12-02 19:53:13 +00:00
Jeff Sharkey
736acb1073 DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac am: 10cdb1130e
am: 45ba8593c0

Change-Id: I2040801dcb090ea635e5840232130d69ee14aef8
2016-12-02 19:52:56 +00:00
Android Build Merger (Role)
c91876dcf3 Merge "DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac am: 10cdb1130e am: dd09c12a61" into nyc-mr2-dev-plus-aosp 2016-12-02 19:52:53 +00:00
Jeff Sharkey
e98f3f4d08 DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac am: 10cdb1130e
am: dd09c12a61

Change-Id: I724f1a005adb3c743daa974228838eff0ec9cca2
2016-12-02 19:52:06 +00:00
Jaekyun Seok
195caa6696 Merge "Remove static link in Android framework under /frameworks/base." am: c60963e451 am: 5705ad69db
am: ae21f6f5b0

Change-Id: Ie0306a1e3dc80f6ee6ad9669b91d150167b04586
2016-12-02 19:51:59 +00:00
TreeHugger Robot
0221d16cf4 Merge "Allow only U+0020..U+007E characters for axis tag." 2016-12-02 19:48:57 +00:00
Jeff Sharkey
b46e9bb9cb Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470 am: 8c74832d5e am: 07ad2a9063
am: a75ce3a705

Change-Id: Ic4004d4923cc544a4babc457bc5cdb024bc9ee51
2016-12-02 19:44:25 +00:00
Jaekyun Seok
ae21f6f5b0 Merge "Remove static link in Android framework under /frameworks/base." am: c60963e451
am: 5705ad69db

Change-Id: I3f2c38332115a7b52b893629f2a5007d75c2831d
2016-12-02 19:43:36 +00:00
Jeff Sharkey
45ba8593c0 DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac
am: 10cdb1130e

Change-Id: I8ad049d8577a5bcc1fac76b0644a90b4b4f495aa
2016-12-02 19:43:34 +00:00
Jeff Sharkey
dd09c12a61 DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac
am: 10cdb1130e

Change-Id: Idfe644ae174419c698987de336e072208468866f
2016-12-02 19:43:28 +00:00
Fyodor Kupolov
55dac08a81 Merge "Added get-privapp-permissions command" 2016-12-02 19:36:26 +00:00
Jaekyun Seok
5705ad69db Merge "Remove static link in Android framework under /frameworks/base."
am: c60963e451

Change-Id: I0bbb3cf9a66752f6ee8218a4ac5545091130bbed
2016-12-02 19:35:03 +00:00
Jeff Sharkey
a75ce3a705 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470 am: 8c74832d5e
am: 07ad2a9063

Change-Id: Ia05929a5edcc75490d8388008380d5db8f7edc85
2016-12-02 19:27:26 +00:00
Jeff Sharkey
10cdb1130e DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53
am: 270d1c27ac

Change-Id: I426e531fd2fda1e09276dcfdc774fb548eedbefd
2016-12-02 19:26:31 +00:00
Jeff Sharkey
8fdc5ca042 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am: 0be332852e -s ours am: b685f719f1 am: 45b6a52225 am: 34b87d94e4 am: 30ef1ad5be am: 5fafe8ea7c
am: f923e8c06f  -s ours

Change-Id: Icd8cf530943f0acaa6fe55a3f5a7b8668a48adff
2016-12-02 19:23:59 +00:00
Jeff Sharkey
875fb481a6 DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours am: 3f0e7465cb am: b88d8dc58f am: b4638e2d88 am: bf9a60106b am: 4d80f89b19
am: f88aada344  -s ours

Change-Id: I57b4bfb5a5c928a961659a5daf8f16d54957d319
2016-12-02 19:22:55 +00:00
Jeff Sharkey
bcd0e63c56 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am: 0be332852e -s ours am: b685f719f1 am: 45b6a52225 am: 34b87d94e4 am: 30ef1ad5be am: 652521ae7b
am: 292bee2f74  -s ours

Change-Id: I2be817a6f58b8bbcd050123dd987424603d702f9
2016-12-02 19:21:57 +00:00
Treehugger Robot
c60963e451 Merge "Remove static link in Android framework under /frameworks/base." 2016-12-02 19:21:47 +00:00
Android Build Merger (Role)
455ac29812 Merge "DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours am: 3f0e7465cb am: b88d8dc58f am: b4638e2d88 am: bf9a60106b am: 1afc4b8425 am: d40f62eae8 -s ours" 2016-12-02 19:19:31 +00:00
Jeff Sharkey
07ad2a9063 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470
am: 8c74832d5e

Change-Id: I35d8c2faba5a6f359bbe51b56052bafe90a6cac1
2016-12-02 19:19:29 +00:00
Jeff Sharkey
4a46817792 DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours am: 3f0e7465cb am: b88d8dc58f am: b4638e2d88 am: bf9a60106b am: 1afc4b8425
am: d40f62eae8  -s ours

Change-Id: I01f32e0afc3cae31ec34484833f62ea1f6e6cc54
2016-12-02 19:19:00 +00:00
Android Build Merger (Role)
d2c984112d Merge "Merge "Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e am: 26e6918800 am: ef5d241938 am: 48313052ab" into nyc-mr2-dev-plus-aosp am: d1534dc14a -s ours" 2016-12-02 19:18:47 +00:00
Jeff Sharkey
270d1c27ac DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb
am: 8165a22f53

Change-Id: Iee87f3c3d384bf785b3c6c877a817c35bbdb478b
2016-12-02 19:18:31 +00:00
Android Build Merger (Role)
01ba0174a9 Merge "Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e am: 26e6918800 am: ef5d241938 am: 48313052ab am: 938649a13c -s ours" 2016-12-02 19:18:30 +00:00
Jeff Sharkey
a19374443a Merge "Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e am: 26e6918800 am: ef5d241938 am: 48313052ab" into nyc-mr2-dev-plus-aosp
am: d1534dc14a  -s ours

Change-Id: I902b6cef1b88e15329d9aa0980de4427c9076aa9
2016-12-02 19:17:42 +00:00
Jeff Sharkey
38327384b5 Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e am: 26e6918800 am: ef5d241938 am: 48313052ab
am: 938649a13c  -s ours

Change-Id: I97048cde71a23c627a618a9217e2fcfc7ffff2c3
2016-12-02 19:17:37 +00:00
Android Build Merger (Role)
02b5012805 Merge "Merge "Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e am: 26e6918800 am: ef5d241938 am: 29c335ef2e" into nyc-mr2-dev-plus-aosp am: 1c0d8bf73c -s ours" 2016-12-02 19:17:14 +00:00
Android Build Merger (Role)
4e2e5028c6 Merge "Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e am: 26e6918800 am: ef5d241938 am: 29c335ef2e am: 01f9f1bec2 -s ours" 2016-12-02 19:16:50 +00:00
Jeff Sharkey
72c139858f Merge "Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e am: 26e6918800 am: ef5d241938 am: 29c335ef2e" into nyc-mr2-dev-plus-aosp
am: 1c0d8bf73c  -s ours

Change-Id: I10d850424df8472b25fa9427564dacdddf2b2444
2016-12-02 19:16:06 +00:00
Jeff Sharkey
fff12bfbbd Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e am: 26e6918800 am: ef5d241938 am: 29c335ef2e
am: 01f9f1bec2  -s ours

Change-Id: I2cb165fab892f3206fbdf03a14796ea721c2a2a8
2016-12-02 19:16:00 +00:00
Android Build Merger (Role)
21cbdf733c Merge "Merge "DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b am: ad04786a3d am: 9e7bd59457 am: 94b6048c4a" into nyc-mr2-dev-plus-aosp am: d949aa9afe -s ours" 2016-12-02 19:15:31 +00:00
Jeff Sharkey
f923e8c06f Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am: 0be332852e -s ours am: b685f719f1 am: 45b6a52225 am: 34b87d94e4 am: 30ef1ad5be
am: 5fafe8ea7c

Change-Id: Ia622d8d4b4397979bf69a2ef78e59bc0b6083e9a
2016-12-02 19:15:22 +00:00
Android Build Merger (Role)
47840dbee0 Merge "DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b am: ad04786a3d am: 9e7bd59457 am: 94b6048c4a am: 8d9cb505d5 -s ours" 2016-12-02 19:15:11 +00:00
Jeff Sharkey
c46a3b0dc5 Merge "DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b am: ad04786a3d am: 9e7bd59457 am: 94b6048c4a" into nyc-mr2-dev-plus-aosp
am: d949aa9afe  -s ours

Change-Id: I5c271fd23c03564165faf10d0d7499ef62325d34
2016-12-02 19:14:18 +00:00
Jeff Sharkey
f88aada344 DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours am: 3f0e7465cb am: b88d8dc58f am: b4638e2d88 am: bf9a60106b
am: 4d80f89b19

Change-Id: Ia8296466ffa048e8ada727f7015e74925d6098a3
2016-12-02 19:14:14 +00:00
Jeff Sharkey
8384bb231e DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b am: ad04786a3d am: 9e7bd59457 am: 94b6048c4a
am: 8d9cb505d5  -s ours

Change-Id: I39803911a8f10f0c73a93473d3b9dc67ca185065
2016-12-02 19:14:10 +00:00
Android Build Merger (Role)
ab2b9769d5 Merge "DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b am: ad04786a3d am: 9e7bd59457 am: 0040d4f71c am: 906cec27c2 -s ours" 2016-12-02 19:13:36 +00:00
Jeff Sharkey
af20f25e66 DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b am: ad04786a3d am: 9e7bd59457 am: 0040d4f71c
am: 906cec27c2  -s ours

Change-Id: I46ccdd4afba9b3138397a8536d753e2819d94995
2016-12-02 19:12:50 +00:00
TreeHugger Robot
04a7a5370c Merge "Split home stack into home and recents stack" 2016-12-02 19:12:23 +00:00
TreeHugger Robot
131135af3f Merge "Convert libandroidfw to Android.bp" 2016-12-02 19:11:56 +00:00
Jeff Sharkey
292bee2f74 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am: 0be332852e -s ours am: b685f719f1 am: 45b6a52225 am: 34b87d94e4 am: 30ef1ad5be
am: 652521ae7b

Change-Id: I1b27ce8b97733188112331f969c72ca35e3bff56
2016-12-02 19:09:26 +00:00
Jeff Sharkey
d40f62eae8 DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours am: 3f0e7465cb am: b88d8dc58f am: b4638e2d88 am: bf9a60106b
am: 1afc4b8425

Change-Id: I7b752d76de85f13b0575972271bdca062f86e4d9
2016-12-02 19:08:38 +00:00