OSDN Git Service
Bill Yi [Mon, 5 Dec 2016 19:00:10 +0000 (19:00 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
d3d688a295d28ebd1ee2b849fde78ad5d7620078.
Change-Id: I70458c0379aacd83fc0d033131360178f44e2e57
Bill Yi [Sat, 3 Dec 2016 05:01:26 +0000 (21:01 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7dbe0388d0e3deedd0d214a55361d30335b56502
Auto-generated-cl: translation import
TreeHugger Robot [Sat, 3 Dec 2016 02:49:09 +0000 (02:49 +0000)]
Merge "Have forAllWindows return IME windows in order with IME target"
TreeHugger Robot [Sat, 3 Dec 2016 02:02:17 +0000 (02:02 +0000)]
Merge "Clean up ApplyStyle JNI"
Tenghui Zhu [Fri, 2 Dec 2016 23:16:35 +0000 (23:16 +0000)]
Merge "Recreate the bitmap cache when it is smaller than needed"
Chris Tate [Fri, 2 Dec 2016 23:02:58 +0000 (23:02 +0000)]
Merge "Fix the deadlock problem" am:
fa228e06f6 am:
e8c0e1098e am:
35b99da33a
am:
0455c30035
Change-Id: Ib08f8deadfe6085d6d4368527892c799c42f0757
Chris Tate [Fri, 2 Dec 2016 22:56:10 +0000 (22:56 +0000)]
Merge "Fix the deadlock problem" am:
fa228e06f6 am:
e8c0e1098e
am:
35b99da33a
Change-Id: I5aab63f06fcb6d234cef4d5b9315c712bdd031d1
Tenghui Zhu [Fri, 2 Dec 2016 22:55:41 +0000 (22:55 +0000)]
Merge "Update the documentation related to VD / AVD" into nyc-mr2-dev am:
c6ee7e317f -s ours
am:
17bd8c5c6b -s ours
Change-Id: Iaa780ccb94d61534908a38897c5ad9c37c5124da
Teng-Hui Zhu [Fri, 2 Dec 2016 22:54:39 +0000 (22:54 +0000)]
Update the documentation related to VD / AVD am:
14efe881d4
am:
d76d2d930a -s ours
Change-Id: Ia0cb405e1872d4e2e8c485da01991f679e59bfc4
Jeff Sharkey [Fri, 2 Dec 2016 22:53:45 +0000 (22:53 +0000)]
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 am:
56247334f8 am:
923aef8e02 -s ours am:
f199d511c3 am:
1d752340a7 am:
4aacfce724 am:
5b64f51a1c am:
06f0764320
am:
7358e7bcdf -s ours
Change-Id: I3700a512ec7401190de7fd7177bab7f8880157c4
Jeff Sharkey [Fri, 2 Dec 2016 22:52:41 +0000 (22:52 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
9b85862620 -s ours am:
9277cce7fa am:
a1d1ecbe05 -s ours am:
928c09cd8e am:
5267b63325 am:
a51ebb828a am:
acfda3d71a -s ours am:
0eaa192436 am:
43b3a13803 am:
6786309c03 am:
a43ee01a6d am:
29e38b212f
am:
6a85068035 -s ours
Change-Id: I79ceb46fa35243b9d11554b2493e714e293ebb78
Jeff Sharkey [Fri, 2 Dec 2016 22:51:38 +0000 (22:51 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am:
6b89229d14 am:
a7efe16fe1 -s ours am:
f1085f2dc8 am:
c130d7fd5e am:
948841362a am:
7e54dc58d4 -s ours am:
3fa188bd8f am:
09960bdfcc am:
d12e48494d am:
341813c852 am:
375f16eff4
am:
cd57f1d53b -s ours
Change-Id: I1f6298c244cdba7138e9b63113c01745966d73ac
Chris Tate [Fri, 2 Dec 2016 22:51:11 +0000 (22:51 +0000)]
Merge "Fix the deadlock problem" am:
fa228e06f6
am:
e8c0e1098e
Change-Id: Ibf2ad3736be9cbe4797c1678e3665be4a19d82ea
Jeff Sharkey [Fri, 2 Dec 2016 22:50:39 +0000 (22:50 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
91add43ae7 am:
792d49dfb5 -s ours am:
32af84320b am:
8b5fa0c0c0 am:
d081cb0ab7 am:
cd35e746dc -s ours am:
836b54e6bb am:
383e0cfa06 am:
a55258bd17 am:
2f48a6ce63 am:
00cc40c40a
am:
a793aee959 -s ours
Change-Id: Ied9ec46ff6de0f641ab258b3f660fbdc61d49ce5
Paul Stewart [Fri, 2 Dec 2016 22:49:40 +0000 (22:49 +0000)]
Merge changes from topic 'fast-bss-transition' into nyc-mr2-dev am:
3eda32cc71
am:
b271a2227a
Change-Id: I49acf0d8cfb091b0aae94ca5756e2d1509dd4e0b
Chris Tate [Fri, 2 Dec 2016 22:45:47 +0000 (22:45 +0000)]
Merge "Fix the deadlock problem"
am:
fa228e06f6
Change-Id: I862d3cedcf38c81f22559439aa8f00ac2ab3cca3
Android Build Merger (Role) [Fri, 2 Dec 2016 22:45:33 +0000 (22:45 +0000)]
Merge changes from topic 'am-
eb4443f078884e5f82b9ce2fd7dec764'
* changes:
Add capability flag for 802.11r fast BSS transition am:
fbb63b0923 am:
67e2694fd6
Add constants for 802.11r am:
3ed7caa0f9 am:
7e6940d728
Wale Ogunwale [Fri, 2 Dec 2016 22:44:52 +0000 (14:44 -0800)]
Have forAllWindows return IME windows in order with IME target
If there is an IME target make sure to return the IME windows next
to the IME target when processing WindowContainer.forAllWindows().
Several users of forAllWindows are expecting this to be the cases so
it is close to the visual order.
Test: bit FrameworksServicesTests:com.android.server.wm.DisplayContentTests
Test: bit FrameworksServicesTests:com.android.server.wm.WindowLayersControllerTests
Change-Id: I737f88ca607ab2694391419d0d38060c03b53840
Paul Stewart [Fri, 2 Dec 2016 22:44:08 +0000 (22:44 +0000)]
Add capability flag for 802.11r fast BSS transition am:
fbb63b0923
am:
67e2694fd6
Change-Id: I35dab6b5bf7e7b383789abc769793d945ebbd834
Paul Stewart [Fri, 2 Dec 2016 22:43:07 +0000 (22:43 +0000)]
Add constants for 802.11r am:
3ed7caa0f9
am:
7e6940d728
Change-Id: Ic86302bd0ef53ee5797b2caf9cb998e40537ef12
Tenghui Zhu [Fri, 2 Dec 2016 22:42:18 +0000 (22:42 +0000)]
Merge "Update the documentation related to VD / AVD" into nyc-mr2-dev
am:
c6ee7e317f -s ours
Change-Id: Ic572a69b41226103e31fc1e544558990d5255dc5
TreeHugger Robot [Fri, 2 Dec 2016 22:42:10 +0000 (22:42 +0000)]
Merge "Allow system_server to measure emulated stats."
Chris Tate [Fri, 2 Dec 2016 22:39:57 +0000 (22:39 +0000)]
Merge "Fix the deadlock problem"
Teng-Hui Zhu [Fri, 2 Dec 2016 22:37:18 +0000 (22:37 +0000)]
Update the documentation related to VD / AVD
am:
14efe881d4
Change-Id: I48ec679b5318fb14f8cc4e74f55694af5c798214
Jeff Sharkey [Fri, 2 Dec 2016 22:28:25 +0000 (22:28 +0000)]
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 am:
56247334f8 am:
923aef8e02 -s ours am:
f199d511c3 am:
1d752340a7 am:
4aacfce724 am:
5b64f51a1c
am:
06f0764320
Change-Id: I2040270fa6f80c06f76a797d0ad9ae2fdf6a9f20
Jeff Sharkey [Fri, 2 Dec 2016 22:27:11 +0000 (22:27 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
9b85862620 -s ours am:
9277cce7fa am:
a1d1ecbe05 -s ours am:
928c09cd8e am:
5267b63325 am:
a51ebb828a am:
acfda3d71a -s ours am:
0eaa192436 am:
43b3a13803 am:
6786309c03 am:
a43ee01a6d
am:
29e38b212f
Change-Id: I40543d50c8c40688ebd2e28a05ade6284c8942d2
Jeff Sharkey [Fri, 2 Dec 2016 22:26:03 +0000 (22:26 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am:
6b89229d14 am:
a7efe16fe1 -s ours am:
f1085f2dc8 am:
c130d7fd5e am:
948841362a am:
7e54dc58d4 -s ours am:
3fa188bd8f am:
09960bdfcc am:
d12e48494d am:
341813c852
am:
375f16eff4
Change-Id: Ia7400dc5280a87cfa687c0b84b124bdb8db6381d
Jakub Pawlowski [Fri, 2 Dec 2016 22:25:16 +0000 (22:25 +0000)]
Merge changes from topic 'ble_oob_sc_mr2' into nyc-mr2-dev am:
c977c776c2
am:
70093bc29a
Change-Id: Ic24b66e7d17a6595c084eaa16a01818c810ca201
Tenghui Zhu [Fri, 2 Dec 2016 22:25:02 +0000 (22:25 +0000)]
Merge "Update the documentation related to VD / AVD" into nyc-mr2-dev
Jeff Sharkey [Fri, 2 Dec 2016 22:24:54 +0000 (22:24 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
91add43ae7 am:
792d49dfb5 -s ours am:
32af84320b am:
8b5fa0c0c0 am:
d081cb0ab7 am:
cd35e746dc -s ours am:
836b54e6bb am:
383e0cfa06 am:
a55258bd17 am:
2f48a6ce63
am:
00cc40c40a
Change-Id: I194205a9ae60f187364590bbf32f42f246d3b912
Jakub Pawlowski [Fri, 2 Dec 2016 22:23:41 +0000 (22:23 +0000)]
BLE OOB Pairing - parse address type (5/5) am:
3e73713590
am:
5d7e4b45bb
Change-Id: Ice4e6c936f568932f8e0f4644d88241b8c30f90d
Paul Stewart [Fri, 2 Dec 2016 22:23:29 +0000 (22:23 +0000)]
Merge changes from topic 'fast-bss-transition' into nyc-mr2-dev
am:
3eda32cc71
Change-Id: Iacbf01ae85184c019bb462a7cf55efa2bb4645d5
Jakub Pawlowski [Fri, 2 Dec 2016 22:21:55 +0000 (22:21 +0000)]
Fix Bluetooth OOB pairing not working for unseen devices am:
2d0ebcf3a0
am:
d9b67b3a70
Change-Id: I40eaa2a23d28037b2989e8518ae1b57f3cb8acfc
Jakub Pawlowski [Fri, 2 Dec 2016 22:20:33 +0000 (22:20 +0000)]
Add LE Secure Connection data parsing (1/4) am:
8fcff25c4f -s ours
am:
fa2ec462e6
Change-Id: Iebf9f0dce010d128ca0a6803a57aa30135b1ee06
Paul Stewart [Fri, 2 Dec 2016 22:19:07 +0000 (22:19 +0000)]
Add capability flag for 802.11r fast BSS transition
am:
fbb63b0923
Change-Id: I918b0cc6d4b7ab157eabe5a04ce4c04598e01966
Paul Stewart [Fri, 2 Dec 2016 22:18:25 +0000 (22:18 +0000)]
Add constants for 802.11r
am:
3ed7caa0f9
Change-Id: Iff6064efa02138a0458d31f630335c039b057145
Jakub Pawlowski [Fri, 2 Dec 2016 22:14:04 +0000 (22:14 +0000)]
Merge changes from topic 'ble_oob_sc_mr2' into nyc-mr2-dev
am:
c977c776c2
Change-Id: Ic0efac1c5b2abace1e3075eb8b08f4c022a5414c
Jakub Pawlowski [Fri, 2 Dec 2016 22:12:36 +0000 (22:12 +0000)]
BLE OOB Pairing - parse address type (5/5)
am:
3e73713590
Change-Id: I12b662d43aedab8315d9273e55bfc4203bfc6272
Jakub Pawlowski [Fri, 2 Dec 2016 22:11:45 +0000 (22:11 +0000)]
Fix Bluetooth OOB pairing not working for unseen devices
am:
2d0ebcf3a0
Change-Id: Ifd76075e33e75c03e54aec99b0327e0c9a8f70e6
Jakub Pawlowski [Fri, 2 Dec 2016 22:10:53 +0000 (22:10 +0000)]
Add LE Secure Connection data parsing (1/4)
am:
8fcff25c4f -s ours
Change-Id: Ib9a253c5a4cd69e9eb3028e9c8477ac9acdc3105
Tyler Gunn [Fri, 2 Dec 2016 21:54:16 +0000 (21:54 +0000)]
Merge "Change prototype for "setCamera" in IMS VideoProvider."
Fyodor Kupolov [Fri, 2 Dec 2016 21:28:09 +0000 (21:28 +0000)]
Merge "Switch isUserUnlocked/isUserRunning to use UMS.mUserStates"
TreeHugger Robot [Fri, 2 Dec 2016 21:16:03 +0000 (21:16 +0000)]
Merge "Switch over to new "time.android.com" NTP pool."
Jeff Sharkey [Fri, 2 Dec 2016 21:02:37 +0000 (21:02 +0000)]
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 am:
56247334f8 am:
923aef8e02 -s ours am:
f199d511c3 am:
1d752340a7 am:
4aacfce724 am:
5b64f51a1c am:
6fa7e324fe
am:
5100194fbc -s ours
Change-Id: Ic9fa83c273adf160cebe7517c3ddfc905150553c
Jeff Sharkey [Fri, 2 Dec 2016 21:01:36 +0000 (21:01 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
9b85862620 -s ours am:
9277cce7fa am:
a1d1ecbe05 -s ours am:
928c09cd8e am:
5267b63325 am:
a51ebb828a am:
acfda3d71a -s ours am:
0eaa192436 am:
43b3a13803 am:
6786309c03 am:
a43ee01a6d am:
ca76b0420a
am:
e5d52664c2 -s ours
Change-Id: I442c44aaa41235660080a4ef4a3eac54da49bca2
Jeff Sharkey [Fri, 2 Dec 2016 21:00:37 +0000 (21:00 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am:
6b89229d14 am:
a7efe16fe1 -s ours am:
f1085f2dc8 am:
c130d7fd5e am:
948841362a am:
7e54dc58d4 -s ours am:
3fa188bd8f am:
09960bdfcc am:
d12e48494d am:
341813c852 am:
65d1a92c92
am:
01f036ebfd -s ours
Change-Id: I86abcf0af426c18eb996e21a685dcf050506da30
Jeff Sharkey [Fri, 2 Dec 2016 20:59:39 +0000 (20:59 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
91add43ae7 am:
792d49dfb5 -s ours am:
32af84320b am:
8b5fa0c0c0 am:
d081cb0ab7 am:
cd35e746dc -s ours am:
836b54e6bb am:
383e0cfa06 am:
a55258bd17 am:
2f48a6ce63 am:
90055d575c
am:
57c8b867c4 -s ours
Change-Id: Ib6d5a414d0b58db436c1b8344d1fd0ef9bd5f766
Jeff Sharkey [Fri, 2 Dec 2016 20:54:23 +0000 (20:54 +0000)]
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 am:
56247334f8 am:
923aef8e02 -s ours am:
f199d511c3 am:
1d752340a7 am:
4aacfce724 am:
5b64f51a1c
am:
6fa7e324fe
Change-Id: I537d2e35ef28a2d3a34efa4253e89395b0250c10
Jeff Sharkey [Fri, 2 Dec 2016 20:53:25 +0000 (20:53 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
9b85862620 -s ours am:
9277cce7fa am:
a1d1ecbe05 -s ours am:
928c09cd8e am:
5267b63325 am:
a51ebb828a am:
acfda3d71a -s ours am:
0eaa192436 am:
43b3a13803 am:
6786309c03 am:
a43ee01a6d
am:
ca76b0420a
Change-Id: Ibca5f8839dbaaa7380bd9630681bcec60b8e0bf9
Jeff Sharkey [Fri, 2 Dec 2016 20:52:30 +0000 (20:52 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am:
6b89229d14 am:
a7efe16fe1 -s ours am:
f1085f2dc8 am:
c130d7fd5e am:
948841362a am:
7e54dc58d4 -s ours am:
3fa188bd8f am:
09960bdfcc am:
d12e48494d am:
341813c852
am:
65d1a92c92
Change-Id: I9af1728fa9c933884c11c9f6484e6b4700edb912
Jeff Sharkey [Fri, 2 Dec 2016 20:51:36 +0000 (20:51 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
91add43ae7 am:
792d49dfb5 -s ours am:
32af84320b am:
8b5fa0c0c0 am:
d081cb0ab7 am:
cd35e746dc -s ours am:
836b54e6bb am:
383e0cfa06 am:
a55258bd17 am:
2f48a6ce63
am:
90055d575c
Change-Id: I66d069fcfeb32664a880bf6fc518f2d77b98bf36
John Reck [Wed, 23 Nov 2016 18:39:40 +0000 (10:39 -0800)]
Clean up ApplyStyle JNI
Bug:
32573798
Mark input uint32_t[] as const. Use Read-only JNI
array access for input as it's faster than critical access.
Use non-movable arrays for TypedArray so that the address can
be resolved and stored, avoiding the need to do JNI array
access for the output.
Indicies is always non-null, so remove the optional checks.
Eliminate unused return value.
Benchmark results:
twelveKeyInflate 4963us -> 4713us
simpleViewInflate 73us -> 60us
Test: Device boots, benchmarks show faster
Change-Id: Ic3bde5aee31407d8903913f97f2218daf074499a
Jeff Sharkey [Fri, 2 Dec 2016 20:47:04 +0000 (20:47 +0000)]
Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am:
8e14278209 am:
a80cbeeee2 am:
44e8914f8b am:
26f78f5836 -s ours am:
99b97e5ed1 am:
398cdb6929 am:
f00515f4d9" into cw-f-dev am:
2e73db5b9c am:
1157adb305
am:
2bf8e5abcb -s ours
Change-Id: I2c917bc370e3cb6c8b0d856cf0ab3b70ef541926
Jeff Sharkey [Fri, 2 Dec 2016 20:45:37 +0000 (20:45 +0000)]
Merge "Merge "Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am:
8e14278209 am:
a80cbeeee2 am:
44e8914f8b am:
26f78f5836 -s ours am:
99b97e5ed1 am:
398cdb6929 am:
f00515f4d9" into cw-f-dev am:
2e73db5b9c" into nyc-mr1-dev-plus-aosp am:
ed09e67751" into nyc-mr2-dev-plus-aosp
am:
18735cc1a5 -s ours
Change-Id: I8f98aa56334687f8ddc62436cddb671946c5c6b2
Jeff Sharkey [Fri, 2 Dec 2016 20:45:29 +0000 (20:45 +0000)]
Merge "Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am:
8e14278209 am:
a80cbeeee2 am:
44e8914f8b am:
26f78f5836 -s ours am:
99b97e5ed1 am:
398cdb6929 am:
f00515f4d9" into cw-f-dev am:
2e73db5b9c" into nyc-mr1-dev-plus-aosp am:
ed09e67751
am:
9397f3c366 -s ours
Change-Id: Ia27daa943c2487d886f75af647086d094eef8c20
Jeff Sharkey [Fri, 2 Dec 2016 20:43:58 +0000 (20:43 +0000)]
Merge "Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am:
8e14278209 am:
a80cbeeee2 am:
44e8914f8b am:
26f78f5836 -s ours am:
99b97e5ed1 am:
398cdb6929 am:
f00515f4d9" into cw-f-dev am:
2e73db5b9c am:
0e673a8143" into nyc-mr2-dev-plus-aosp
am:
24ce7d651f -s ours
Change-Id: I6a0d73ace014da7566aa868952953390574cda06
Jeff Sharkey [Fri, 2 Dec 2016 20:43:54 +0000 (20:43 +0000)]
Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am:
8e14278209 am:
a80cbeeee2 am:
44e8914f8b am:
26f78f5836 -s ours am:
99b97e5ed1 am:
398cdb6929 am:
f00515f4d9" into cw-f-dev am:
2e73db5b9c am:
0e673a8143
am:
e1f2060eab -s ours
Change-Id: Iadecf5ed497196bb8118d61d0686c80bffd47d99
Jeff Sharkey [Fri, 2 Dec 2016 20:42:27 +0000 (20:42 +0000)]
Merge "Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am:
8e14278209 am:
a80cbeeee2 am:
44e8914f8b am:
26f78f5836 -s ours am:
99b97e5ed1 am:
398cdb6929 am:
f00515f4d9 am:
17d6ba41b8" into nyc-mr1-dev-plus-aosp am:
a2a069e998" into nyc-mr2-dev-plus-aosp
am:
6cb8cff20a -s ours
Change-Id: Ie73e72a71dea3126d6b9f3a7281cb49c0992082a
Jeff Sharkey [Fri, 2 Dec 2016 20:42:22 +0000 (20:42 +0000)]
Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am:
8e14278209 am:
a80cbeeee2 am:
44e8914f8b am:
26f78f5836 -s ours am:
99b97e5ed1 am:
398cdb6929 am:
f00515f4d9 am:
17d6ba41b8" into nyc-mr1-dev-plus-aosp am:
a2a069e998
am:
8a97e90f9c -s ours
Change-Id: I9ea2fd7893f1db835a2df49c33dbf2b005250a4f
Jeff Sharkey [Fri, 2 Dec 2016 20:40:41 +0000 (20:40 +0000)]
Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am:
8e14278209 am:
a80cbeeee2 am:
44e8914f8b am:
26f78f5836 -s ours am:
99b97e5ed1 am:
398cdb6929 am:
f00515f4d9 am:
17d6ba41b8 am:
95d6c7e59a" into nyc-mr2-dev-plus-aosp
am:
3ef390afb2 -s ours
Change-Id: I24872c24ea2231e1dff28dd1046602be192534a1
Jeff Sharkey [Fri, 2 Dec 2016 20:40:36 +0000 (20:40 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am:
8e14278209 am:
a80cbeeee2 am:
44e8914f8b am:
26f78f5836 -s ours am:
99b97e5ed1 am:
398cdb6929 am:
f00515f4d9 am:
17d6ba41b8 am:
95d6c7e59a
am:
50a914886c -s ours
Change-Id: I78b446c25f26f75d617b8fce3acacfe7f6ba50cd
Jeff Sharkey [Fri, 2 Dec 2016 20:38:52 +0000 (20:38 +0000)]
Merge "Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am:
8e14278209 am:
a80cbeeee2 am:
44e8914f8b am:
26f78f5836 -s ours am:
99b97e5ed1 am:
398cdb6929 am:
f00515f4d9 am:
5bf382063d" into nyc-mr1-dev-plus-aosp am:
ec7e6c33d7" into nyc-mr2-dev-plus-aosp
am:
2282ec207f -s ours
Change-Id: I2df404050a6fb2be4a6e1cf168667f769efc26e5
Jeff Sharkey [Fri, 2 Dec 2016 20:38:45 +0000 (20:38 +0000)]
Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am:
8e14278209 am:
a80cbeeee2 am:
44e8914f8b am:
26f78f5836 -s ours am:
99b97e5ed1 am:
398cdb6929 am:
f00515f4d9 am:
5bf382063d" into nyc-mr1-dev-plus-aosp am:
ec7e6c33d7
am:
5697bc0dfc -s ours
Change-Id: I384d9d5b4fe12ca37fb036199c9fced77b2ea0f4
Jeff Sharkey [Fri, 2 Dec 2016 20:38:32 +0000 (20:38 +0000)]
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 am:
56247334f8 am:
923aef8e02 -s ours am:
f199d511c3 am:
1d752340a7 am:
4aacfce724
am:
5b64f51a1c
Change-Id: Ieb9e7636cf14afed49fd925299fc504505c1731f
Jeff Sharkey [Fri, 2 Dec 2016 20:37:55 +0000 (20:37 +0000)]
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 am:
56247334f8 am:
923aef8e02 -s ours am:
f199d511c3 am:
1d752340a7 am:
4aacfce724
am:
5b64f51a1c
Change-Id: I6434ed9331a3a34d15fb4628bf1979508de161b8
Jeff Sharkey [Fri, 2 Dec 2016 20:37:20 +0000 (20:37 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
9b85862620 -s ours am:
9277cce7fa am:
a1d1ecbe05 -s ours am:
928c09cd8e am:
5267b63325 am:
a51ebb828a am:
acfda3d71a -s ours am:
0eaa192436 am:
43b3a13803 am:
6786309c03
am:
a43ee01a6d
Change-Id: I737ca593b673dae19b0b4a259ddf1583a687d5a5
Jeff Sharkey [Fri, 2 Dec 2016 20:36:56 +0000 (20:36 +0000)]
Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am:
8e14278209 am:
a80cbeeee2 am:
44e8914f8b am:
26f78f5836 -s ours am:
99b97e5ed1 am:
398cdb6929 am:
f00515f4d9 am:
5bf382063d am:
b09bcc7328" into nyc-mr2-dev-plus-aosp
am:
214b523a6a -s ours
Change-Id: Ied75877c0a1e1bb73429d7b109a8bca684cdf3d8
Jeff Sharkey [Fri, 2 Dec 2016 20:36:51 +0000 (20:36 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
9b85862620 -s ours am:
9277cce7fa am:
a1d1ecbe05 -s ours am:
928c09cd8e am:
5267b63325 am:
a51ebb828a am:
acfda3d71a -s ours am:
0eaa192436 am:
43b3a13803 am:
6786309c03
am:
a43ee01a6d
Change-Id: I1a332bdc9c87dfe5f4d23d7aaa885bae5d7434bb
Jeff Sharkey [Fri, 2 Dec 2016 20:36:50 +0000 (20:36 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am:
8e14278209 am:
a80cbeeee2 am:
44e8914f8b am:
26f78f5836 -s ours am:
99b97e5ed1 am:
398cdb6929 am:
f00515f4d9 am:
5bf382063d am:
b09bcc7328
am:
bfd33d0377 -s ours
Change-Id: Icf3b9cb0f5e25bb745660efff1ed092d4c37ed7a
Jeff Sharkey [Fri, 2 Dec 2016 20:36:00 +0000 (20:36 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am:
6b89229d14 am:
a7efe16fe1 -s ours am:
f1085f2dc8 am:
c130d7fd5e am:
948841362a am:
7e54dc58d4 -s ours am:
3fa188bd8f am:
09960bdfcc am:
d12e48494d
am:
341813c852
Change-Id: I996957f442210076ee810d8a0eb8cc70a3a9be07
Jeff Sharkey [Fri, 2 Dec 2016 20:35:56 +0000 (20:35 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am:
6b89229d14 am:
a7efe16fe1 -s ours am:
f1085f2dc8 am:
c130d7fd5e am:
948841362a am:
7e54dc58d4 -s ours am:
3fa188bd8f am:
09960bdfcc am:
d12e48494d
am:
341813c852
Change-Id: Ia32a4880fc1c050122050099660d23322a51bbcc
Jeff Sharkey [Fri, 2 Dec 2016 20:35:08 +0000 (20:35 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
91add43ae7 am:
792d49dfb5 -s ours am:
32af84320b am:
8b5fa0c0c0 am:
d081cb0ab7 am:
cd35e746dc -s ours am:
836b54e6bb am:
383e0cfa06 am:
a55258bd17
am:
2f48a6ce63
Change-Id: I4d17af1f12a727bd5b00167ccb19a045791f18a6
Jeff Sharkey [Fri, 2 Dec 2016 20:35:08 +0000 (20:35 +0000)]
Merge "Merge "DO NOT MERGE: Check provider access for content changes. am:
4ddbf942a0 am:
190e20c2b5 am:
74b36307a0 am:
4ad177829a -s ours am:
c067e76bba am:
0891ca2fad am:
12b2f8a275 am:
71e4281969" into nyc-mr1-dev-plus-aosp am:
2bfad25b06" into nyc-mr2-dev-plus-aosp
am:
0c7267b698 -s ours
Change-Id: Id7d6b94ee0c175697e5485c5cdc4354bdc23eb6b
Jeff Sharkey [Fri, 2 Dec 2016 20:35:06 +0000 (20:35 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
91add43ae7 am:
792d49dfb5 -s ours am:
32af84320b am:
8b5fa0c0c0 am:
d081cb0ab7 am:
cd35e746dc -s ours am:
836b54e6bb am:
383e0cfa06 am:
a55258bd17
am:
2f48a6ce63
Change-Id: Ie9f87cf495bc3ffbdba03dc2ee5f2933790883d0
Jeff Sharkey [Fri, 2 Dec 2016 20:35:05 +0000 (20:35 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes. am:
4ddbf942a0 am:
190e20c2b5 am:
74b36307a0 am:
4ad177829a -s ours am:
c067e76bba am:
0891ca2fad am:
12b2f8a275 am:
71e4281969" into nyc-mr1-dev-plus-aosp am:
2bfad25b06
am:
3d83246be3 -s ours
Change-Id: Ia691ca2f22e62a2a3fa775eeaff1cb38e10178b4
Jeff Sharkey [Fri, 2 Dec 2016 20:33:32 +0000 (20:33 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes. am:
4ddbf942a0 am:
190e20c2b5 am:
74b36307a0 am:
4ad177829a -s ours am:
c067e76bba am:
0891ca2fad am:
12b2f8a275 am:
71e4281969 am:
0af2fdee40" into nyc-mr2-dev-plus-aosp
am:
89ecf83fa6 -s ours
Change-Id: I01a9ae19bc9ae3d1eed5285f47fff4d5c8f9fa9e
Jeff Sharkey [Fri, 2 Dec 2016 20:33:27 +0000 (20:33 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
4ddbf942a0 am:
190e20c2b5 am:
74b36307a0 am:
4ad177829a -s ours am:
c067e76bba am:
0891ca2fad am:
12b2f8a275 am:
71e4281969 am:
0af2fdee40
am:
a5b6631392 -s ours
Change-Id: I7a95ca3a057bebce4fe1c704edbddbc41bb542b2
Jeff Sharkey [Fri, 2 Dec 2016 20:32:02 +0000 (20:32 +0000)]
Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am:
8e14278209 am:
a80cbeeee2 am:
44e8914f8b am:
26f78f5836 -s ours am:
99b97e5ed1 am:
398cdb6929 am:
f00515f4d9 am:
17d6ba41b8 am:
9ce28af49c" into nyc-mr2-dev-plus-aosp
am:
0596e4f267 -s ours
Change-Id: I49c764e81462f096d7b4833d913a84ad700db1dd
Jeff Sharkey [Fri, 2 Dec 2016 20:31:56 +0000 (20:31 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am:
8e14278209 am:
a80cbeeee2 am:
44e8914f8b am:
26f78f5836 -s ours am:
99b97e5ed1 am:
398cdb6929 am:
f00515f4d9 am:
17d6ba41b8 am:
9ce28af49c
am:
ec4dfe1584 -s ours
Change-Id: I31337e47b260845377d3cac1beec9950defe14fa
Jeff Sharkey [Fri, 2 Dec 2016 20:30:17 +0000 (20:30 +0000)]
Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am:
8e14278209 am:
a80cbeeee2 am:
44e8914f8b am:
26f78f5836 -s ours am:
99b97e5ed1 am:
398cdb6929 am:
f00515f4d9 am:
5bf382063d am:
f196c044f3" into nyc-mr2-dev-plus-aosp
am:
05c36cb1ca -s ours
Change-Id: Iff2218f7a5e2cfb9f42339d91d4cbee6f6f79b49
Jeff Sharkey [Fri, 2 Dec 2016 20:30:11 +0000 (20:30 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am:
8e14278209 am:
a80cbeeee2 am:
44e8914f8b am:
26f78f5836 -s ours am:
99b97e5ed1 am:
398cdb6929 am:
f00515f4d9 am:
5bf382063d am:
f196c044f3
am:
80328894a6 -s ours
Change-Id: I030ea5da0dd0c8a3f6cd1d9782187d16ac5fb788
Jeff Sharkey [Fri, 2 Dec 2016 20:28:26 +0000 (20:28 +0000)]
Merge "Merge "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" into nyc-mr1-dev-plus-aosp am:
30aca837c8" into nyc-mr2-dev-plus-aosp
am:
c0e91458bf -s ours
Change-Id: Iae55b7bc8f4ace84533e7ddfc13b9bb0edd28c98
Jeff Sharkey [Fri, 2 Dec 2016 20:28:22 +0000 (20:28 +0000)]
Merge "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" into nyc-mr1-dev-plus-aosp am:
30aca837c8
am:
811f10c209 -s ours
Change-Id: Id919ca839e6ae8418381a454b8aa3e95ca363f6d
Jeff Sharkey [Fri, 2 Dec 2016 20:27:07 +0000 (20:27 +0000)]
Merge "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:
0ae6bb63ea" into nyc-mr2-dev-plus-aosp
am:
6cbcfe78c9 -s ours
Change-Id: Ic7d54919f93534aa60f311ba46735b497b5010c2
Jeff Sharkey [Fri, 2 Dec 2016 20:27:03 +0000 (20:27 +0000)]
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:
0ae6bb63ea
am:
d9a1804962 -s ours
Change-Id: I18f1aa9f5e0bad29c79d41430b027e508c1cd2f4
Jeff Sharkey [Fri, 2 Dec 2016 20:25:37 +0000 (20:25 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes. am:
4ddbf942a0 am:
190e20c2b5 am:
74b36307a0 am:
4ad177829a -s ours am:
c067e76bba am:
0891ca2fad am:
12b2f8a275 am:
71e4281969 am:
d01f22d0b2" into nyc-mr2-dev-plus-aosp
am:
70c962bdd6 -s ours
Change-Id: Id92c124e3cf24b88ec031b0b7a4e298bf3f2a087
Jeff Sharkey [Fri, 2 Dec 2016 20:25:31 +0000 (20:25 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
4ddbf942a0 am:
190e20c2b5 am:
74b36307a0 am:
4ad177829a -s ours am:
c067e76bba am:
0891ca2fad am:
12b2f8a275 am:
71e4281969 am:
d01f22d0b2
am:
7d72a117ef -s ours
Change-Id: Ia0853bd47bfaa1d76ffbe1f952aeaf09c238cf6a
Jeff Sharkey [Fri, 2 Dec 2016 20:24:01 +0000 (20:24 +0000)]
Merge "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" into nyc-mr1-dev-plus-aosp am:
fb9a16a3f3" into nyc-mr2-dev-plus-aosp
am:
29c4a517fe -s ours
Change-Id: Ibdc5e1f9a7a7798a6d8ba9e10daa986a08199b59
Jeff Sharkey [Fri, 2 Dec 2016 20:23:54 +0000 (20:23 +0000)]
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" into nyc-mr1-dev-plus-aosp am:
fb9a16a3f3
am:
84938307a9 -s ours
Change-Id: I27d9fc94ea345cf8481295efab717ceb552b3177
Jeff Sharkey [Fri, 2 Dec 2016 20:22:18 +0000 (20:22 +0000)]
Merge "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" into nyc-mr2-dev-plus-aosp
am:
b249844ee2 -s ours
Change-Id: I78f423d26cd023085f87ac3be5a7c8588985ad22
Jeff Sharkey [Fri, 2 Dec 2016 20:22:12 +0000 (20:22 +0000)]
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
Jeff Sharkey [Fri, 2 Dec 2016 20:20:39 +0000 (20:20 +0000)]
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 am:
56247334f8 am:
923aef8e02 -s ours am:
f199d511c3 am:
1d752340a7
am:
4aacfce724
Change-Id: I954a47982a94c14abeeee205015423b9d6c19cea
Jeff Sharkey [Fri, 2 Dec 2016 20:20:36 +0000 (20:20 +0000)]
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
Jeff Sharkey [Fri, 2 Dec 2016 20:20:30 +0000 (20:20 +0000)]
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
Jeff Sharkey [Fri, 2 Dec 2016 20:19:28 +0000 (20:19 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
9b85862620 -s ours am:
9277cce7fa am:
a1d1ecbe05 -s ours am:
928c09cd8e am:
5267b63325 am:
a51ebb828a am:
acfda3d71a -s ours am:
0eaa192436 am:
43b3a13803
am:
6786309c03
Change-Id: Ie17a80be06549016951ff91792586e1dc2e004cc
Jeff Sharkey [Fri, 2 Dec 2016 20:18:50 +0000 (20:18 +0000)]
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
Jeff Sharkey [Fri, 2 Dec 2016 20:18:44 +0000 (20:18 +0000)]
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
Jeff Sharkey [Fri, 2 Dec 2016 20:18:32 +0000 (20:18 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am:
6b89229d14 am:
a7efe16fe1 -s ours am:
f1085f2dc8 am:
c130d7fd5e am:
948841362a am:
7e54dc58d4 -s ours am:
3fa188bd8f am:
09960bdfcc
am:
d12e48494d
Change-Id: I32c59ff8fd27596728ba87180cdf8e0c06d0d6ba
Jeff Sharkey [Fri, 2 Dec 2016 20:17:49 +0000 (13:17 -0700)]
Allow system_server to measure emulated stats.
Historically we pushed all system_server SD card interactions through
DefaultContainerService to avoid holding open FDs, but it's safe to
measure disk usage for internal emulated storage when looking
directly at /data/media, since there is no risk of unsafe ejection.
Test: builds, boots, and access allowed
Bug:
33298975
Change-Id: I1491065aad47cd16e7fdd586bce021ff61c003c6
Jaekyun Seok [Fri, 2 Dec 2016 20:17:37 +0000 (20:17 +0000)]
Merge "Remove static link in Android framework under /frameworks/base." am:
c60963e451 am:
5705ad69db am:
ae21f6f5b0
am:
195caa6696 -s ours
Change-Id: If30455d6043d7e63e48bf2773198bd80f2524937
OSDN Git Service
