OSDN Git Service
Christopher Tate [Sat, 15 Oct 2016 01:29:15 +0000 (01:29 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am:
f4d23f30c9 am:
f93e1f2671 am:
7044826aa8 am:
25c278dcbf -s ours am:
db3446aa0f am:
73549cb683 am:
aae3099501 am:
d26087f0c2
am:
99586879d1 -s ours
Change-Id: Ib7d2c9ecadd3167a7878c9d33e605d5002030356
Christopher Tate [Sat, 15 Oct 2016 01:22:19 +0000 (01:22 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am:
f4d23f30c9 am:
f93e1f2671 am:
7044826aa8 am:
25c278dcbf -s ours am:
db3446aa0f am:
73549cb683 am:
aae3099501
am:
d26087f0c2
Change-Id: I75e14833ae9c56917af17d057a9eecc5f7fd76c0
Christopher Tate [Sat, 15 Oct 2016 01:13:43 +0000 (01:13 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am:
f4d23f30c9 am:
f93e1f2671 am:
7044826aa8 am:
25c278dcbf -s ours am:
db3446aa0f am:
73549cb683
am:
aae3099501
Change-Id: I34011bd0f715e8e893d60c70a3946b1f09a25d14
Christopher Tate [Sat, 15 Oct 2016 01:06:47 +0000 (01:06 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am:
f4d23f30c9 am:
f93e1f2671 am:
7044826aa8 am:
25c278dcbf -s ours am:
db3446aa0f
am:
73549cb683
Change-Id: I39071b3e3e336ee4888a8a60d84a454a74f8c023
Christopher Tate [Sat, 15 Oct 2016 01:01:34 +0000 (01:01 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into nyc-dev am:
3af8419137 am:
d0c65faeb1 am:
28965a0748 am:
f6563001cf
am:
6dcb83d70a -s ours
Change-Id: I3b0ca05c703b31cc74d4049dc69544065852465a
Christopher Tate [Sat, 15 Oct 2016 01:01:09 +0000 (01:01 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am:
f4d23f30c9 am:
f93e1f2671 am:
7044826aa8 am:
25c278dcbf -s ours
am:
db3446aa0f
Change-Id: I53cfc5839b1fd8a8bb8ed892ebba4165000c695e
Christopher Tate [Sat, 15 Oct 2016 01:00:42 +0000 (01:00 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am:
477963198a am:
32a4c2599f am:
91c5f27374 am:
7d745bdcfb
am:
50cb3f8532 -s ours
Change-Id: I1118979b5ff93ae84e8dbd45ab41ff62e8c6fb26
Christopher Tate [Sat, 15 Oct 2016 00:54:30 +0000 (00:54 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into nyc-dev am:
3af8419137 am:
d0c65faeb1 am:
28965a0748
am:
f6563001cf
Change-Id: I50719e6441faf07a0ed1a71c4f90d9eec90b894e
Yohei Yukawa [Sat, 15 Oct 2016 00:53:51 +0000 (00:53 +0000)]
Merge "Handle exceptions from #requestPermission()" into nyc-mr1-dev am:
eb7aad4d85 am:
c010107e84
am:
de943d3f43
Change-Id: Ic18aa172c04dd9a8b09a88108c78281c84f147f9
Christopher Tate [Sat, 15 Oct 2016 00:53:38 +0000 (00:53 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am:
477963198a am:
32a4c2599f am:
91c5f27374
am:
7d745bdcfb
Change-Id: Icb495e128fb79ec24e60faafff7daff6faf88e55
Yohei Yukawa [Sat, 15 Oct 2016 00:52:52 +0000 (00:52 +0000)]
Handle exceptions from #requestPermission() am:
93278ca144 am:
f8621ff5bf
am:
36e5feffb7
Change-Id: I31405b72394d8425679e4b39ef89d4c68c2f9e11
Christopher Tate [Sat, 15 Oct 2016 00:52:46 +0000 (00:52 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am:
f4d23f30c9 am:
f93e1f2671 am:
7044826aa8
am:
25c278dcbf -s ours
Change-Id: I660aeed03a70fa359374e86fd413dd216d5b061e
Yohei Yukawa [Sat, 15 Oct 2016 00:45:38 +0000 (00:45 +0000)]
Merge "Handle exceptions from #requestPermission()" into nyc-mr1-dev am:
eb7aad4d85
am:
c010107e84
Change-Id: I77a1e0fe7818cc16003a53e66a51841e9092b743
Christopher Tate [Sat, 15 Oct 2016 00:45:36 +0000 (00:45 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into nyc-dev am:
3af8419137 am:
d0c65faeb1
am:
28965a0748
Change-Id: I7006ad86bad738c48f722761aba43e18d1985ec6
Yohei Yukawa [Sat, 15 Oct 2016 00:44:43 +0000 (00:44 +0000)]
Handle exceptions from #requestPermission() am:
93278ca144
am:
f8621ff5bf
Change-Id: I682e19b9f0657f840536b558204faf37872a7b36
Christopher Tate [Sat, 15 Oct 2016 00:44:43 +0000 (00:44 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am:
f4d23f30c9 am:
f93e1f2671
am:
7044826aa8
Change-Id: Ia3129e0748d14e8250ac39d0f0e383318c9999bf
Christopher Tate [Sat, 15 Oct 2016 00:44:42 +0000 (00:44 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am:
477963198a am:
32a4c2599f
am:
91c5f27374
Change-Id: I615af9e3259c32723cdb262c9f49586fe9b134b0
Christopher Tate [Sat, 15 Oct 2016 00:38:07 +0000 (00:38 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into nyc-dev am:
3af8419137
am:
d0c65faeb1
Change-Id: I964c6f4c1c270d4e020da36c82307e1f7c12f46d
Yohei Yukawa [Sat, 15 Oct 2016 00:37:27 +0000 (00:37 +0000)]
Merge "Handle exceptions from #requestPermission()" into nyc-mr1-dev
am:
eb7aad4d85
Change-Id: I93a790da4befac06d0d7585b3a9c2db6d3316e54
Christopher Tate [Sat, 15 Oct 2016 00:37:25 +0000 (00:37 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am:
f4d23f30c9
am:
f93e1f2671
Change-Id: I202adaed715d782a393733fefc8a3712e06280e2
Yohei Yukawa [Sat, 15 Oct 2016 00:37:24 +0000 (00:37 +0000)]
Handle exceptions from #requestPermission()
am:
93278ca144
Change-Id: I5e8a3a9a670b1e794ce3af670fb30ffc4b8302a5
Christopher Tate [Sat, 15 Oct 2016 00:37:19 +0000 (00:37 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am:
477963198a
am:
32a4c2599f
Change-Id: Ia14be15da964e002e8e4c60ba5259142f6e3aebd
Yohei Yukawa [Sat, 15 Oct 2016 00:31:19 +0000 (00:31 +0000)]
Merge "Handle exceptions from #requestPermission()" into nyc-mr1-dev
Dirk Dougherty [Sat, 15 Oct 2016 00:30:50 +0000 (00:30 +0000)]
Merge "Add API 25 to @since list." into nyc-mr1-dev am:
289eac2319 am:
d098555ad2
am:
9f0aec42b6
Change-Id: I769aa634f7fe88e86c46d0ef2c912579f190be77
Christopher Tate [Sat, 15 Oct 2016 00:29:58 +0000 (00:29 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into nyc-dev
am:
3af8419137
Change-Id: If970889a7c146a77eb1c6c85e0d49393635cc81d
Christopher Tate [Sat, 15 Oct 2016 00:29:56 +0000 (00:29 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders
am:
477963198a
Change-Id: Ia908cf6fa470678d9f2a07b55033a7a1dbc8b1a0
Dirk Dougherty [Sat, 15 Oct 2016 00:29:45 +0000 (00:29 +0000)]
Add API 25 to @since list. am:
3376f5893f am:
a3c7c8883f
am:
f9516473d5
Change-Id: I8101f7b6a509b3e8928307194c4e6f953ca19a9c
Christopher Tate [Sat, 15 Oct 2016 00:29:43 +0000 (00:29 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders
am:
f4d23f30c9
Change-Id: I0d22b5345bc4b3305bd2bcf68d485c0f06dfc15b
TreeHugger Robot [Sat, 15 Oct 2016 00:23:35 +0000 (00:23 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into nyc-dev
Dirk Dougherty [Sat, 15 Oct 2016 00:22:05 +0000 (00:22 +0000)]
Merge "Add API 25 to @since list." into nyc-mr1-dev am:
289eac2319
am:
d098555ad2
Change-Id: Id236f714cfb24921952e4c3fa3f1ebc5b53a4873
Dirk Dougherty [Sat, 15 Oct 2016 00:21:16 +0000 (00:21 +0000)]
Add API 25 to @since list. am:
3376f5893f
am:
a3c7c8883f
Change-Id: I19088f473a1110f16307b1ac49234ee58cbb3d03
Dirk Dougherty [Sat, 15 Oct 2016 00:13:45 +0000 (00:13 +0000)]
Merge "Add API 25 to @since list." into nyc-mr1-dev
am:
289eac2319
Change-Id: I1d227e959511ba5fff3a423314afa5cefa339e0d
Dirk Dougherty [Sat, 15 Oct 2016 00:13:39 +0000 (00:13 +0000)]
Add API 25 to @since list.
am:
3376f5893f
Change-Id: I0245ac6b2b1bd941d667defbbdb47933e06fd8f2
TreeHugger Robot [Sat, 15 Oct 2016 00:09:05 +0000 (00:09 +0000)]
Merge "Add API 25 to @since list." into nyc-mr1-dev
Julius D'souza [Sat, 15 Oct 2016 00:03:34 +0000 (00:03 +0000)]
Merge "DO NOT MERGE: remove miscellaneous logging" into cw-f-dev am:
c9da667b01
am:
4e959b4839 -s ours
Change-Id: I14aad9250670957867ec720c8f588fe0d18ca4d0
Julius D'souza [Sat, 15 Oct 2016 00:02:36 +0000 (00:02 +0000)]
DO NOT MERGE: remove miscellaneous logging am:
897373916f
am:
7845f23920 -s ours
Change-Id: I3a40e5ab98c7ec8b05645aea5d528da68095585c
Julius D'souza [Fri, 14 Oct 2016 23:53:48 +0000 (23:53 +0000)]
Merge "DO NOT MERGE: remove miscellaneous logging" into cw-f-dev
am:
c9da667b01
Change-Id: Ifb9cf132c6af795a4184bf6b0ad3f0f39f3425a4
Julius D'souza [Fri, 14 Oct 2016 23:53:43 +0000 (23:53 +0000)]
DO NOT MERGE: remove miscellaneous logging
am:
897373916f
Change-Id: I1917dd91694a8edbf1b1f427909bd7e65f63008c
Julius D'souza [Fri, 14 Oct 2016 23:47:07 +0000 (23:47 +0000)]
Merge "DO NOT MERGE: remove miscellaneous logging" into cw-f-dev
TreeHugger Robot [Fri, 14 Oct 2016 23:39:08 +0000 (23:39 +0000)]
Merge "Allow system settings to update TvInputInfo"
TreeHugger Robot [Fri, 14 Oct 2016 23:33:50 +0000 (23:33 +0000)]
Merge "Drawing debug focus on Books/Recommended for you/MORE button"
Andrii Kulian [Fri, 14 Oct 2016 23:27:03 +0000 (23:27 +0000)]
Merge "Make usage of Configuration.EMPTY safe"
Christopher Tate [Tue, 16 Aug 2016 23:03:44 +0000 (16:03 -0700)]
DO NOT MERGE Isolated processes don't get precached system service binders
More specifically, they get a PackageManager binder -- necessary for
Android process startup and configuration -- but none of the other
usual preloaded service binders.
Bug
30202228
Change-Id: I3810649f504cd631665ece338a83d2e54d41ad05
(cherry picked from commit
2c61c57ac53cbb270b4e76b9d04465f8a3f6eadc)
Christopher Tate [Tue, 16 Aug 2016 23:03:44 +0000 (16:03 -0700)]
DO NOT MERGE Isolated processes don't get precached system service binders
More specifically, they get a PackageManager binder -- necessary for
Android process startup and configuration -- but none of the other
usual preloaded service binders.
Bug
30202228
Change-Id: I3810649f504cd631665ece338a83d2e54d41ad05
(cherry picked from commit
2c61c57ac53cbb270b4e76b9d04465f8a3f6eadc)
Adam Lesinski [Fri, 14 Oct 2016 22:51:01 +0000 (22:51 +0000)]
Merge "Update DisplayMetrics even on default display" into nyc-mr1-dev am:
4510b9af38 am:
13b5c5947f
am:
6f4189d424
Change-Id: I2e538423ff25077d0376eeed3fc96ec0332546f8
Adam Lesinski [Fri, 14 Oct 2016 22:49:40 +0000 (22:49 +0000)]
Update DisplayMetrics even on default display am:
4309721843 am:
dab7950d80
am:
d7ec1ea697
Change-Id: Iad9907c77fb1b7b81073150807d6f18a75a24d6e
Adam Lesinski [Fri, 14 Oct 2016 22:45:17 +0000 (22:45 +0000)]
Merge "Update DisplayMetrics even on default display" into nyc-mr1-dev am:
4510b9af38
am:
13b5c5947f
Change-Id: I3da8b109924828fec8a28ca23696b1df4f46ac2b
Adam Lesinski [Fri, 14 Oct 2016 22:41:35 +0000 (22:41 +0000)]
Update DisplayMetrics even on default display am:
4309721843
am:
dab7950d80
Change-Id: I8bb2c9c303380abd3e1a54af68b8a8f7da3225f7
Android Build Merger (Role) [Fri, 14 Oct 2016 22:36:06 +0000 (22:36 +0000)]
Merge "Merge "Docs: Fixed the menu navigation instructions" into nyc-dev am:
5b2493a655 am:
52b9db5a82 am:
109e738292 am:
0849ffa5c1 am:
f9dc6498d9"
Hemal Patel [Fri, 14 Oct 2016 22:35:22 +0000 (22:35 +0000)]
Merge "Docs: Fixed the menu navigation instructions" into nyc-dev am:
5b2493a655 am:
52b9db5a82 am:
109e738292 am:
0849ffa5c1
am:
f9dc6498d9
Change-Id: I5adc740cdcb3604ce59949318d9a4e350520f327
Android Build Merger (Role) [Fri, 14 Oct 2016 22:34:55 +0000 (22:34 +0000)]
Merge "Docs: Fixed the menu navigation instructions am:
c29dac71c0 am:
c2a22f3b41 am:
f055b640eb am:
6233b45093 am:
739934271d"
Adam Lesinski [Fri, 14 Oct 2016 22:34:09 +0000 (22:34 +0000)]
Merge "Update DisplayMetrics even on default display" into nyc-mr1-dev
am:
4510b9af38
Change-Id: I530609c9e89ebc9054c57e5614fa1465289f82da
Adam Lesinski [Fri, 14 Oct 2016 22:34:06 +0000 (22:34 +0000)]
Update DisplayMetrics even on default display
am:
4309721843
Change-Id: Ib79935f0b80df42db789d94e0a88ac7a0b0b40d5
Hemal Patel [Fri, 14 Oct 2016 22:34:06 +0000 (22:34 +0000)]
Docs: Fixed the menu navigation instructions am:
c29dac71c0 am:
c2a22f3b41 am:
f055b640eb am:
6233b45093
am:
739934271d
Change-Id: I56bf2b3399f6561665cd1f26534c0784ad3d317e
Winson Chung [Fri, 14 Oct 2016 22:34:00 +0000 (22:34 +0000)]
Merge "Adding PIP input consumer."
Adam Lesinski [Fri, 14 Oct 2016 22:28:13 +0000 (22:28 +0000)]
Merge "Update DisplayMetrics even on default display" into nyc-mr1-dev
Hemal Patel [Fri, 14 Oct 2016 22:27:46 +0000 (22:27 +0000)]
Merge "Docs: Fixed the menu navigation instructions" into nyc-dev am:
5b2493a655 am:
52b9db5a82 am:
109e738292
am:
0849ffa5c1
Change-Id: Ib86d877ff112d49513a4b2f5c7e1c1b5394be87f
Yohei Yukawa [Fri, 14 Oct 2016 07:07:59 +0000 (00:07 -0700)]
Handle exceptions from #requestPermission()
This is a follow up CL to my previous CL [1] that let
IInputConnectionWrapper to call InputContentInfo#requestPermission()
automatically so that temporary URI permissions can be granted
automatically on API 25+ devices whenever
INPUT_CONTENT_GRANT_READ_URI_PERMISSION is specified.
However, in that CL we forgot to handle exceptions thrown from
InputContentInfo#requestPermission(). This is problematic because it is
actually easy for IMEs to cause SecurityException by specifying a
content URI that does not allow grantUriPermission, e.g.:
inputConnection.commitContent(
new InputContentInfo(Uri.parse("content://call_log/test"),
new ClipDescription("test", new String[]{"image/gif"}));
As a result, IMEs can let the application crash at any time because
InputContentInfo#requestPermission() is automatically called inside the
Framework.
This CL makes sure that exceptions thrown from
InputContentInfo#requestPermission() can be handled gracefully.
[1]: Id955435dd2e72549ee7134f46b3c6951581694ad
f3806f57a59ede663f3fa2ad1f5080bdbf20e372
Bug:
32162481
Change-Id: I08916a1f54518390d3b67ab1673dc901e3f9716a
Hemal Patel [Fri, 14 Oct 2016 22:26:35 +0000 (22:26 +0000)]
Docs: Fixed the menu navigation instructions am:
c29dac71c0 am:
c2a22f3b41 am:
f055b640eb
am:
6233b45093
Change-Id: I3ef63bb9673f917f2e2300b2fee85e945c8962bd
Hemal Patel [Fri, 14 Oct 2016 22:20:35 +0000 (22:20 +0000)]
Merge "Docs: Fixed the menu navigation instructions" into nyc-dev am:
5b2493a655 am:
52b9db5a82
am:
109e738292
Change-Id: Ief4bd204f415c043afc571cde50e997596d729b8
Julius D'souza [Fri, 14 Oct 2016 21:45:40 +0000 (14:45 -0700)]
DO NOT MERGE: remove miscellaneous logging
Change-Id: Id5ca513228e87b3d3b4e66ad34537ed454c65ad2
Hemal Patel [Fri, 14 Oct 2016 22:18:33 +0000 (22:18 +0000)]
Docs: Fixed the menu navigation instructions am:
c29dac71c0 am:
c2a22f3b41
am:
f055b640eb
Change-Id: I66254d562342d878af0ef1e4435bb4c211e9757f
Hemal Patel [Fri, 14 Oct 2016 22:11:42 +0000 (22:11 +0000)]
Merge "Docs: Fixed the menu navigation instructions" into nyc-dev am:
5b2493a655
am:
52b9db5a82
Change-Id: I9e7093c33b8409f88ba5a9319a417c2e89fc7342
Hemal Patel [Fri, 14 Oct 2016 22:10:34 +0000 (22:10 +0000)]
Docs: Fixed the menu navigation instructions am:
c29dac71c0
am:
c2a22f3b41
Change-Id: Ic96f48238e790f925caf7d666681d865deeacf11
Hemal Patel [Fri, 14 Oct 2016 22:02:15 +0000 (22:02 +0000)]
Merge "Docs: Fixed the menu navigation instructions" into nyc-dev
am:
5b2493a655
Change-Id: I7fdb0dabb7f530c71e4331261fbac874eea36da9
Hemal Patel [Fri, 14 Oct 2016 22:02:10 +0000 (22:02 +0000)]
Docs: Fixed the menu navigation instructions
am:
c29dac71c0
Change-Id: I0f22649ba3c4dbbca06e5d5087d6fde6737a8467
Hemal Patel [Fri, 14 Oct 2016 21:52:44 +0000 (21:52 +0000)]
Merge "Docs: Fixed the menu navigation instructions" into nyc-dev
TreeHugger Robot [Fri, 14 Oct 2016 21:37:38 +0000 (21:37 +0000)]
Merge "Emulator: Fix CTS failure caused by removed MANAGE_USERS permission in Shell"
Vadim Tryshev [Fri, 14 Oct 2016 01:51:13 +0000 (18:51 -0700)]
Drawing debug focus on Books/Recommended for you/MORE button
1. Taking into account scroll state
2. Drawing focus also for views with edges.
Bug:
32099818
Test: Manually ensure that that button draws focus
Change-Id: I085db4deb1561d8b480e4012018d48bc83a7f81f
TreeHugger Robot [Fri, 14 Oct 2016 20:22:48 +0000 (20:22 +0000)]
Merge "PluginLib: Don't use foreach"
Jason Monk [Fri, 14 Oct 2016 20:11:00 +0000 (20:11 +0000)]
Fix launching alarm pending intent am:
d0408f0028 am:
9042736ff1 am:
6aa197116e am:
2abab0248f
am:
4843210683
Change-Id: If5b683724d4f984bf4b995f93556e4fda4a19432
Jakub Adámek [Fri, 14 Oct 2016 20:09:57 +0000 (20:09 +0000)]
Merge "Adding customizable background color support for watch." into cw-f-dev am:
881011d951
am:
c744ba2426
Change-Id: I02355e93e8130f139064db00672b86e3fa2e67c0
Jakub Adamek [Fri, 14 Oct 2016 20:08:56 +0000 (20:08 +0000)]
Adding customizable background color support for watch. am:
e39fbd8785
am:
abb22a1387
Change-Id: Idab75f8ba70ac915e00d80f630cb63c6c52f956c
George Burgess IV [Fri, 14 Oct 2016 20:07:51 +0000 (20:07 +0000)]
Merge "Fix static-analyzer warning." am:
2fbf30d3fe am:
a52992e290 am:
c88628da5e
am:
a40eeb0979
Change-Id: I973bb3f7f72f38133472874727b4297042ee0a50
Jakub Pawlowski [Fri, 14 Oct 2016 20:06:42 +0000 (20:06 +0000)]
Merge "Fix Bluetooth OOB pairing not working for unseen devices" am:
3ef0315eb7 am:
bd1a923cac am:
08109a61d2
am:
414c77ce1c
Change-Id: I4a694e543037263cfa80b2cf5473acfee9d007c0
Sungsoo [Fri, 14 Oct 2016 20:05:41 +0000 (20:05 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
c11f599a2f am:
29e643bcbd am:
68aa33b9bf -s ours am:
2a762996cb -s ours am:
a8d06257c1 am:
2179b54c9c -s ours am:
279ebd7ffd am:
7598d6ac9f am:
30404396be am:
d7475b491d -s ours am:
3069b72d76 am:
20b502a6b1
am:
97d7eba123 -s ours
Change-Id: I5725c9dba9ad2d20728738ecf0e4738f55603ac8
Sungsoo [Fri, 14 Oct 2016 20:04:41 +0000 (20:04 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
22bd36448e -s ours am:
3992742559 am:
2816a5fa5e -s ours am:
03593fe78f am:
ad11872ded am:
d3f3729a17 am:
9d675aadf1 -s ours am:
3ab3eff7c1 am:
b25d26c40c
am:
5e2766e93e -s ours
Change-Id: I2d259112685e8462fd382c44390fb242058ef70a
Sungsoo [Fri, 14 Oct 2016 20:03:37 +0000 (20:03 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
87a9ac70c3 am:
11b522b40f -s ours am:
8b764f10c3 am:
29273190f1 am:
7bb855a973 am:
68469a695e -s ours am:
b4fdad2b8c am:
93b3e8e606
am:
6dac084668 -s ours
Change-Id: I2761c5eae18e85e55bbde2c05eec6d6a65480091
Sungsoo [Fri, 14 Oct 2016 20:02:40 +0000 (20:02 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
7ce9243087 am:
bb800841ca am:
016c5889bc am:
d6508621fc -s ours am:
b576f816c5 am:
315b8b7bbc
am:
adb0afcef1 -s ours
Change-Id: I10e18ba16e72a8ec35c49af53c67161cc0e2590e
Sungsoo Lim [Fri, 14 Oct 2016 20:01:25 +0000 (20:01 +0000)]
Merge "ExifInterface: Provide backward compatibility" into nyc-dev am:
e29077105e am:
013d3a4964
am:
9da35bbaad
Change-Id: Id45b326022e64b4a887552a932068ae4661fa2a6
Sungsoo [Fri, 14 Oct 2016 20:00:16 +0000 (20:00 +0000)]
ExifInterface: Provide backward compatibility am:
2dbe166801 am:
6e01f028ab
am:
e441ce97a8
Change-Id: Ie090e52708d58c6965aba75a3162757b442d5a19
Svetoslav Ganov [Fri, 14 Oct 2016 19:58:35 +0000 (19:58 +0000)]
Merge "Allow SetupWizard to do WiFi scans if location off" am:
c98b34bdce am:
72510e6244 am:
cf146edb32
am:
a6b3788891
Change-Id: Id16507a948dec243f4f04afdc6e54668759a0fa9
Bert McMeen [Fri, 14 Oct 2016 19:57:34 +0000 (19:57 +0000)]
Docs: Updates to the Download/Test file related to watch setup am:
137c545e4e am:
4c5141b98b
am:
74217dfeba
Change-Id: I8de80fa266d0e005b1ee8410ac5fab8cd924a471
Yuta Yamada [Fri, 14 Oct 2016 19:56:39 +0000 (19:56 +0000)]
Merge "Fix memory leak of Dnd tile" am:
6057a8360a am:
465397e28e am:
be3b53beca
am:
dd1bd9875f
Change-Id: Ifa54d483f383183ca4fd0864e514d399022db632
Selim Cinek [Fri, 14 Oct 2016 19:55:26 +0000 (19:55 +0000)]
Merge "DO NOT MERGE - Fixed an issue where the emergency affordance would show" am:
6f3a05ae77 -s ours am:
20307881d7 -s ours am:
e58f1e5965
am:
f69a47fcdc -s ours
Change-Id: I63d0ced98812deb638ba5f18d5714587814c2dc9
Selim Cinek [Fri, 14 Oct 2016 19:54:22 +0000 (19:54 +0000)]
Merge "DO NOT MERGE - Added translations for emergency action string" am:
d33e79c328 -s ours am:
cb654a5fbd -s ours am:
8bd7df4536
am:
c01d969abf -s ours
Change-Id: I751abbad21cd2b9db34d6f3445a56c0183c1f5e2
Robert Greenwalt [Fri, 14 Oct 2016 19:53:11 +0000 (19:53 +0000)]
Merge "Add free short codes for direct carrier billing and others" am:
73c50f7dbc am:
6f8c54a16d am:
2b06e19f2d
am:
c8c013f88d
Change-Id: I4aa6e7a91c1aa5e228443ae994fc149f9fd3f4ba
Shinji Sogo [Fri, 14 Oct 2016 19:52:14 +0000 (19:52 +0000)]
Merge "Don't compare FQDN with providerFriendlyName" am:
aae64557e1 am:
9c84160545 am:
b8bab1df10
am:
dafb19bb59
Change-Id: Id05db87f864df47245a748531cbdad4b27f6da1c
Adam Lesinski [Fri, 14 Oct 2016 19:51:05 +0000 (19:51 +0000)]
Merge "RRO: Synchronize access to overlays.list" am:
78382db820 am:
1b9303e8f0 am:
c68597e671
am:
29331aed30
Change-Id: Ibd05ff10372089e1b9ebed22d3e20fa6e5cc5f3a
Jorim Jaggi [Fri, 14 Oct 2016 19:49:57 +0000 (19:49 +0000)]
Merge "Fix split-screen flash issue" am:
6738617652 am:
f1fed4de21 am:
4e7407a80e
am:
3f23c9f36e
Change-Id: I195eee0b57f216ab1778d74fc7ec72b6d36e244b
bohu [Mon, 26 Sep 2016 23:20:07 +0000 (16:20 -0700)]
Emulator: Fix CTS failure caused by removed MANAGE_USERS permission in Shell
BUG:
31648062
Change-Id: I9679c18c0e3611ebc9779408826f182ea8f1e88b
(cherry picked from commit
57f47e8490b68678fd123cdc111d5073ec994382)
Rebecca Silberstein [Fri, 14 Oct 2016 19:48:54 +0000 (19:48 +0000)]
Merge "Tethering: check if configManager is null" am:
e011bf80c5 am:
d1e4dbf002 am:
d33a0ee710
am:
e0a27e855b
Change-Id: I0c1fc0ca1458a322a1d225d6271c5616d00b2b50
Brad Ebinger [Fri, 14 Oct 2016 19:47:28 +0000 (19:47 +0000)]
Merge "Transplant the Logging system from Telecom" am:
cbb03d1ad3 am:
951dca8209 am:
0ab9a078e9
am:
be243f5b84
Change-Id: I7ecfb9d748df18a1b5625138b5b402fb1bdecbea
Christopher Wiley [Fri, 14 Oct 2016 19:44:26 +0000 (19:44 +0000)]
Merge "IndexOutOfBoundsException observed in ProcessStats" am:
6408e2e5cc am:
eedd2b529d am:
53d12379f4
am:
5f9fedc5d7
Change-Id: Id23911d3ff1e90cf88711a7aa7749acdd81a26ae
John Reck [Fri, 14 Oct 2016 19:43:20 +0000 (19:43 +0000)]
Merge "Fix SurfaceViewPositionListener race bugs" am:
2dc11c0500 am:
ee3adf6d91 am:
f136fa872f
am:
11cbf7b830
Change-Id: Ia982ffd2819b59515afecdf6f18c72f36ea86a23
Andre Eisenbach [Fri, 14 Oct 2016 19:42:16 +0000 (19:42 +0000)]
Merge "List HF_INDICATORS_VALUE_CHANGED broadcast as protected" am:
5c043f51b0 am:
3c3329bd34 am:
d6a85bdea3
am:
9c45a3184e
Change-Id: I2acd3943375a0cc1e271bd7cec8b3cbfd4f6f248
Andreas Gampe [Fri, 14 Oct 2016 19:41:14 +0000 (19:41 +0000)]
Merge "Debug: Use UniqueFile" am:
546f755bf8 am:
8d151b26c2 am:
77a2f22f77
am:
34030a16ba
Change-Id: Iae938803213da2bb3b05204c1796ffa4babb39d0
Selim Cinek [Fri, 14 Oct 2016 19:39:58 +0000 (19:39 +0000)]
Merge "DO NOT MERGE - Added Emergency affordance feature" am:
a0322d5c5a -s ours am:
00c553e1ba -s ours am:
8f681f7220
am:
b05ceb233e -s ours
Change-Id: If0087103642b7ff1907665711c4a5821ac8beff4
lei.peng [Fri, 14 Oct 2016 19:38:59 +0000 (19:38 +0000)]
Merge "Modify the case in adjustFocus when the mFocusedActivity is null" am:
80587da3c1 am:
93c75d07c1 am:
d975003af3
am:
167f01a13a -s ours
Change-Id: I218c0eae30e8279284792e9e3fe119ee879b1826
TreeHugger Robot [Fri, 14 Oct 2016 19:36:16 +0000 (19:36 +0000)]
Merge "Fixed issue with IME window not been added to its window token"
OSDN Git Service
