OSDN Git Service
Steven Thomas [Fri, 16 Jun 2017 21:47:16 +0000 (21:47 +0000)]
Merge "Enable vr mode and persistent vr mode at device boot" into oc-dr1-dev
am:
573daaaede
Change-Id: I3a8ce7d52c18891c46e0631998c8834d52f31bdf
Steven Thomas [Fri, 16 Jun 2017 21:36:51 +0000 (21:36 +0000)]
Merge "Enable vr mode and persistent vr mode at device boot" into oc-dr1-dev
Jeff Davidson [Fri, 16 Jun 2017 20:58:33 +0000 (20:58 +0000)]
Merge "Allow EuiccService IPCs to happen in parallel." into oc-dr1-dev
am:
79c7a85d60
Change-Id: I38d9099f2e46b550a2d77f089937792379274ecc
Jeff Davidson [Fri, 16 Jun 2017 20:50:02 +0000 (20:50 +0000)]
Merge "Allow EuiccService IPCs to happen in parallel." into oc-dr1-dev
Rob Carr [Fri, 16 Jun 2017 20:43:34 +0000 (20:43 +0000)]
Merge "Merge "ViewRootImpl: More null checks for performTraversals." into oc-dev am:
6f87503ed8" into oc-dr1-dev
am:
a870c65331
Change-Id: Iea78aa8b8bd90c29d22f2a38dd424f0dd4eb1afd
Alison Cichowlas [Fri, 16 Jun 2017 20:36:12 +0000 (20:36 +0000)]
Merge "Hide power dialog when lockscreen comes and goes." into oc-dr1-dev
am:
c05a764e5e
Change-Id: Id9b37d40c09fd27e405c13977925bf4beb37175f
Fyodor Kupolov [Fri, 16 Jun 2017 20:30:14 +0000 (20:30 +0000)]
Merge "Merge "Always log new user state to event log" into oc-dev am:
6db4406fbd" into oc-dr1-dev
am:
111041d62f
Change-Id: I554a0331c43dbb56de220670d92c7796a010b3a9
Android Build Merger (Role) [Fri, 16 Jun 2017 20:27:38 +0000 (20:27 +0000)]
Merge "Merge "ViewRootImpl: More null checks for performTraversals." into oc-dev am:
6f87503ed8 am:
c52b16c97d" into oc-dr1-dev-plus-aosp
Rob Carr [Fri, 16 Jun 2017 20:26:29 +0000 (20:26 +0000)]
Merge "ViewRootImpl: More null checks for performTraversals." into oc-dev am:
6f87503ed8
am:
c52b16c97d
Change-Id: I6343246eaffc1943d8748490acf51e682b1c5bee
Android Build Merger (Role) [Fri, 16 Jun 2017 20:24:35 +0000 (20:24 +0000)]
Merge "Merge "WallpaperColors refactor" into oc-dr1-dev am:
04d2ec59e8" into oc-dr1-dev-plus-aosp
Lucas Dupin [Fri, 16 Jun 2017 20:22:50 +0000 (20:22 +0000)]
Merge "WallpaperColors refactor" into oc-dr1-dev
am:
04d2ec59e8
Change-Id: I0c684d8f93c368038c3d0328cac58fab576e021f
Fyodor Kupolov [Fri, 16 Jun 2017 20:20:33 +0000 (20:20 +0000)]
Merge "Always log new user state to event log" into oc-dev am:
6db4406fbd
am:
62b76a388f
Change-Id: Idaa6c938594b49acb233b64f611e050d0e8f5558
Android Build Merger (Role) [Fri, 16 Jun 2017 20:14:21 +0000 (20:14 +0000)]
Merge "Merge "ViewRootImpl: More null checks for performTraversals." into oc-dev am:
6f87503ed8" into oc-dr1-dev
Alison Cichowlas [Fri, 16 Jun 2017 20:13:06 +0000 (20:13 +0000)]
Merge "Hide power dialog when lockscreen comes and goes." into oc-dr1-dev
Rob Carr [Fri, 16 Jun 2017 20:12:17 +0000 (20:12 +0000)]
Merge "ViewRootImpl: More null checks for performTraversals." into oc-dev
am:
6f87503ed8
Change-Id: I3c951fd2572abbada566494b5954697be098865d
Rob Carr [Fri, 16 Jun 2017 20:08:28 +0000 (20:08 +0000)]
Merge "ViewRootImpl: More null checks for performTraversals." into oc-dev
am:
6f87503ed8
Change-Id: I8685f019f33861bffb3b82ef0f494a80a8067d88
Android Build Merger (Role) [Fri, 16 Jun 2017 20:06:22 +0000 (20:06 +0000)]
Merge "Merge "Always log new user state to event log" into oc-dev am:
6db4406fbd" into oc-dr1-dev
Fyodor Kupolov [Fri, 16 Jun 2017 20:05:32 +0000 (20:05 +0000)]
Merge "Always log new user state to event log" into oc-dev
am:
6db4406fbd
Change-Id: I5ed5aacfb054a7c7fef91b0ac51cc89541983818
Fyodor Kupolov [Fri, 16 Jun 2017 20:05:31 +0000 (20:05 +0000)]
Merge "Always log new user state to event log" into oc-dev
am:
6db4406fbd
Change-Id: I975664bc2943ef95340ce8003a1e78d72c7dc2b5
TreeHugger Robot [Fri, 16 Jun 2017 20:04:53 +0000 (20:04 +0000)]
Merge "WallpaperColors refactor" into oc-dr1-dev
Rob Carr [Fri, 16 Jun 2017 19:55:07 +0000 (19:55 +0000)]
Merge "ViewRootImpl: More null checks for performTraversals." into oc-dev
Android Build Merger (Role) [Fri, 16 Jun 2017 19:52:32 +0000 (19:52 +0000)]
Merge "Merge "Define a meta-data attribute for a carrier icon." into oc-dr1-dev am:
963a20772e" into oc-dr1-dev-plus-aosp
Jeff Davidson [Fri, 16 Jun 2017 19:51:31 +0000 (19:51 +0000)]
Merge "Define a meta-data attribute for a carrier icon." into oc-dr1-dev
am:
963a20772e
Change-Id: Ic64dff49ecec45c4c77486196a8661beec3b142f
Fyodor Kupolov [Fri, 16 Jun 2017 19:51:00 +0000 (19:51 +0000)]
Merge "Always log new user state to event log" into oc-dev
Android Build Merger (Role) [Fri, 16 Jun 2017 19:50:52 +0000 (19:50 +0000)]
Merge "Merge "Merge "Throw IAE when service add null AutofillIds on SaveInfo methods." into oc-dev am:
6cde68752c" into oc-dr1-dev am:
5a9a7f5916" into oc-dr1-dev-plus-aosp
Felipe Leme [Fri, 16 Jun 2017 19:49:50 +0000 (19:49 +0000)]
Merge "Merge "Throw IAE when service add null AutofillIds on SaveInfo methods." into oc-dev am:
6cde68752c" into oc-dr1-dev
am:
5a9a7f5916
Change-Id: Ieaefe0524c98bd58232c5d09b5e163ef6e1a5b7e
Android Build Merger (Role) [Fri, 16 Jun 2017 19:49:33 +0000 (19:49 +0000)]
Merge "Merge "Throw IAE when service add null AutofillIds on SaveInfo methods." into oc-dev am:
6cde68752c am:
a0a799f8ed" into oc-dr1-dev-plus-aosp
Phil Weaver [Fri, 16 Jun 2017 19:46:38 +0000 (19:46 +0000)]
Merge "Stop rounded corners from confusing magnification" into oc-dr1-dev
am:
9da5ee9e29
Change-Id: Iff1167256c76798124abda04240f8e412b39d38a
Felipe Leme [Fri, 16 Jun 2017 19:46:34 +0000 (19:46 +0000)]
Merge "Throw IAE when service add null AutofillIds on SaveInfo methods." into oc-dev am:
6cde68752c
am:
a0a799f8ed
Change-Id: Idb2685e683e6aad64d3c60a9d8a9a61fa203c607
Jeff Davidson [Fri, 16 Jun 2017 19:39:51 +0000 (19:39 +0000)]
Merge "Define a meta-data attribute for a carrier icon." into oc-dr1-dev
Felipe Leme [Fri, 16 Jun 2017 19:36:07 +0000 (19:36 +0000)]
Merge "Throw IAE when service add null AutofillIds on SaveInfo methods." into oc-dev
am:
6cde68752c
Change-Id: Ia67129efce12d99e566c1987d653fa3956a926db
Android Build Merger (Role) [Fri, 16 Jun 2017 19:35:10 +0000 (19:35 +0000)]
Merge "Merge "Throw IAE when service add null AutofillIds on SaveInfo methods." into oc-dev am:
6cde68752c" into oc-dr1-dev
Phil Weaver [Fri, 16 Jun 2017 19:34:11 +0000 (19:34 +0000)]
Merge "Stop rounded corners from confusing magnification" into oc-dr1-dev
Felipe Leme [Fri, 16 Jun 2017 19:34:01 +0000 (19:34 +0000)]
Merge "Throw IAE when service add null AutofillIds on SaveInfo methods." into oc-dev
am:
6cde68752c
Change-Id: I9efd96bcd649bd23db28136aa4afca16a677e9ea
TreeHugger Robot [Fri, 16 Jun 2017 19:23:37 +0000 (19:23 +0000)]
Merge "Throw IAE when service add null AutofillIds on SaveInfo methods." into oc-dev
Fan Zhang [Fri, 16 Jun 2017 19:13:35 +0000 (19:13 +0000)]
Merge "Add right padding to two target preference text area" into oc-dr1-dev
am:
a96ba2d88c
Change-Id: I2e706d0a246238aab841646185dc1cb28d46ee2f
TreeHugger Robot [Fri, 16 Jun 2017 19:01:52 +0000 (19:01 +0000)]
Merge "Add right padding to two target preference text area" into oc-dr1-dev
Android Build Merger (Role) [Fri, 16 Jun 2017 18:31:38 +0000 (18:31 +0000)]
Merge "Merge "enable/disable dexopt for instant apps remotely" into oc-dev am:
5d969b9862 am:
1466c1618f" into oc-dr1-dev-plus-aosp
Todd Kennedy [Fri, 16 Jun 2017 18:29:27 +0000 (18:29 +0000)]
Merge "enable/disable dexopt for instant apps remotely" into oc-dev am:
5d969b9862
am:
3586115ae5
Change-Id: I2a8093b966e246ad77ee4257b81bf819443e94c2
Todd Kennedy [Fri, 16 Jun 2017 18:29:26 +0000 (18:29 +0000)]
Merge "enable/disable dexopt for instant apps remotely" into oc-dev am:
5d969b9862
am:
1466c1618f
Change-Id: Iea45d50f2a99de082a7b5ac45c2487bd5785fa04
Todd Kennedy [Fri, 16 Jun 2017 18:19:49 +0000 (18:19 +0000)]
Merge "enable/disable dexopt for instant apps remotely" into oc-dev
am:
5d969b9862
Change-Id: If9f063e5db82c079b7a9e682365a8840ee7da794
Todd Kennedy [Fri, 16 Jun 2017 18:19:45 +0000 (18:19 +0000)]
Merge "enable/disable dexopt for instant apps remotely" into oc-dev
am:
5d969b9862
Change-Id: Ica29f01779c2bb504d682a2b457f861264cc00b0
TreeHugger Robot [Fri, 16 Jun 2017 18:07:46 +0000 (18:07 +0000)]
Merge "enable/disable dexopt for instant apps remotely" into oc-dev
Android Build Merger (Role) [Fri, 16 Jun 2017 18:01:57 +0000 (18:01 +0000)]
Merge "libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours am:
45cd809caa -s ours am:
ce4c7df6a0 -s ours am:
035e2a5c37 -s ours am:
4e5ed845c7 -s ours am:
3cd244e872 -s ours am:
a9bf75f50c -s ours am:
21caf4aee4 -s ours am:
009b3c6aec -s ours am:
acbd7ba4aa -s ours am:
9454abb0ac -s ours" into oc-dr1-dev-plus-aosp
Marco Nelissen [Fri, 16 Jun 2017 17:58:48 +0000 (17:58 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours am:
45cd809caa -s ours am:
ce4c7df6a0 -s ours am:
035e2a5c37 -s ours am:
4e5ed845c7 -s ours am:
3cd244e872 -s ours am:
a9bf75f50c -s ours am:
21caf4aee4 -s ours am:
009b3c6aec -s ours am:
acbd7ba4aa -s ours
am:
9454abb0ac -s ours
Change-Id: Ibd94e79519c8b0cb180091748d5a17c8b13326ce
Marco Nelissen [Fri, 16 Jun 2017 17:58:47 +0000 (17:58 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours am:
45cd809caa -s ours am:
ce4c7df6a0 -s ours am:
035e2a5c37 -s ours am:
4e5ed845c7 -s ours am:
3cd244e872 -s ours am:
a9bf75f50c -s ours am:
21caf4aee4 -s ours am:
009b3c6aec -s ours am:
acbd7ba4aa -s ours
am:
38b8f27e85 -s ours
Change-Id: Iae27f58285d67cc09bbac26154fe49529d7c9a45
Fyodor Kupolov [Fri, 16 Jun 2017 17:45:51 +0000 (10:45 -0700)]
Always log new user state to event log
Previously it wasn't logged for stopping users...
Test: manual
Bug:
38121026
Change-Id: I0fc37224ce1043745dfffcc78639f003c35b402e
Marco Nelissen [Fri, 16 Jun 2017 17:47:15 +0000 (17:47 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours am:
45cd809caa -s ours am:
ce4c7df6a0 -s ours am:
035e2a5c37 -s ours am:
4e5ed845c7 -s ours am:
3cd244e872 -s ours am:
a9bf75f50c -s ours am:
21caf4aee4 -s ours am:
009b3c6aec -s ours
am:
acbd7ba4aa -s ours
Change-Id: I5fda14fc00fe57f090e554c80dd21695420d0058
Marco Nelissen [Fri, 16 Jun 2017 17:47:09 +0000 (17:47 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours am:
45cd809caa -s ours am:
ce4c7df6a0 -s ours am:
035e2a5c37 -s ours am:
4e5ed845c7 -s ours am:
3cd244e872 -s ours am:
a9bf75f50c -s ours am:
21caf4aee4 -s ours am:
009b3c6aec -s ours
am:
acbd7ba4aa -s ours
Change-Id: I17c0c2beb412135905d48636971ad2099b23fcc7
Marco Nelissen [Fri, 16 Jun 2017 17:38:19 +0000 (17:38 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours am:
45cd809caa -s ours am:
ce4c7df6a0 -s ours am:
035e2a5c37 -s ours am:
4e5ed845c7 -s ours am:
3cd244e872 -s ours am:
a9bf75f50c -s ours am:
21caf4aee4 -s ours
am:
009b3c6aec -s ours
Change-Id: Ied441cf591abb8933a5601c6d36066e0288dfbd7
Marco Nelissen [Fri, 16 Jun 2017 17:24:37 +0000 (17:24 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours am:
45cd809caa -s ours am:
ce4c7df6a0 -s ours am:
035e2a5c37 -s ours am:
4e5ed845c7 -s ours am:
3cd244e872 -s ours am:
a9bf75f50c -s ours
am:
21caf4aee4 -s ours
Change-Id: I25f1f4394b6a5a6b3708df13be41299865e76d52
Marco Nelissen [Fri, 16 Jun 2017 17:12:09 +0000 (17:12 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours am:
45cd809caa -s ours am:
ce4c7df6a0 -s ours am:
035e2a5c37 -s ours am:
4e5ed845c7 -s ours am:
3cd244e872 -s ours
am:
a9bf75f50c -s ours
Change-Id: Ib75388665c3586c09e963917bc54b020aae22dce
Marco Nelissen [Fri, 16 Jun 2017 16:59:57 +0000 (16:59 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours am:
45cd809caa -s ours am:
ce4c7df6a0 -s ours am:
035e2a5c37 -s ours am:
4e5ed845c7 -s ours
am:
3cd244e872 -s ours
Change-Id: I256e1413df73fd577708d5dcb84074e3a8ed61ab
Marco Nelissen [Fri, 16 Jun 2017 16:51:14 +0000 (16:51 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours am:
45cd809caa -s ours am:
ce4c7df6a0 -s ours am:
035e2a5c37 -s ours
am:
4e5ed845c7 -s ours
Change-Id: Iae9f79e4b91c4ef5e844259709e3055607a781b8
Marco Nelissen [Fri, 16 Jun 2017 16:41:20 +0000 (16:41 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours am:
45cd809caa -s ours am:
ce4c7df6a0 -s ours
am:
035e2a5c37 -s ours
Change-Id: Ib6f84a832e27329e0eabf000b89e93145c43a31a
Tyler Gunn [Fri, 16 Jun 2017 16:33:49 +0000 (16:33 +0000)]
Merge "Add EXTRA_ALWAYS_USE_VOIP_AUDIO_MODE extrs to phone account" into oc-dr1-dev
am:
8a3620f2cc
Change-Id: I596bca78ad74baa195b57ef4b7d15084b6baf219
Tyler Gunn [Fri, 16 Jun 2017 16:28:36 +0000 (16:28 +0000)]
Merge "Add EXTRA_ALWAYS_USE_VOIP_AUDIO_MODE extrs to phone account" into oc-dr1-dev
Lucas Dupin [Tue, 9 May 2017 19:16:19 +0000 (12:16 -0700)]
WallpaperColors refactor
Hiding color extraction into WallpaperColors.
This enables us to create WallpaperColors from a a Bitmap
or Drawable.
Fixes:
62197187
Fixes:
62490115
Test: runtest --path cts/tests/app/src/android/app/cts/WallpaperColorsTest.java
Change-Id: I614cfa205e02b551a141642eac6de21251c3bff6
Marco Nelissen [Fri, 16 Jun 2017 16:26:30 +0000 (16:26 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours am:
45cd809caa -s ours
am:
ce4c7df6a0 -s ours
Change-Id: I1fb798481ca56b8c81386792b5642a544aae1c7e
Marco Nelissen [Fri, 16 Jun 2017 16:19:02 +0000 (16:19 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours
am:
45cd809caa -s ours
Change-Id: Idd7b2d2536d1c25072794ba228f33fc2459f2aaa
Marco Nelissen [Fri, 16 Jun 2017 16:11:01 +0000 (16:11 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours
am:
23118a9b77 -s ours
Change-Id: Id314511cf3e6af08e0f00e84e8945ea404b85c6a
Marco Nelissen [Fri, 16 Jun 2017 16:02:19 +0000 (16:02 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours
am:
49fc959be3 -s ours
Change-Id: I0eb248911ce1a582a4939e2bd5419659c586128f
Marco Nelissen [Fri, 16 Jun 2017 15:51:48 +0000 (15:51 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours
am:
398d50feeb -s ours
Change-Id: Ide31821909dde91443cdf650216a6ada7277ce9a
Marco Nelissen [Fri, 16 Jun 2017 15:43:46 +0000 (15:43 +0000)]
libmedia_jni.so doesn't need libjhead.so
am:
9a4a34afd8 -s ours
Change-Id: I557d7e96401b742d916e2eef5aa03949018382c7
Bill Yi [Fri, 16 Jun 2017 15:36:27 +0000 (15:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
1e8c673dbf -s ours
Change-Id: Ic676db47b28486d5c11786a53b0c7fb91d0f2074
Android Build Merger (Role) [Fri, 16 Jun 2017 15:31:08 +0000 (15:31 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
d97c62a1da -s ours am:
0c4e13b41d -s ours" into oc-dr1-dev-plus-aosp
TreeHugger Robot [Fri, 16 Jun 2017 15:30:06 +0000 (15:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Fri, 16 Jun 2017 15:28:14 +0000 (15:28 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
d97c62a1da -s ours
am:
b3291471be -s ours
Change-Id: I09e9baef932326a81e31c2a9792939831255990d
Bill Yi [Fri, 16 Jun 2017 15:28:04 +0000 (15:28 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
d97c62a1da -s ours
am:
0c4e13b41d -s ours
Change-Id: I8c2817eb30613de0dfdda6df22b4c14bdebc2827
Bill Yi [Fri, 16 Jun 2017 15:21:10 +0000 (15:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
d97c62a1da -s ours
Change-Id: I0c7cdc5f73d7e4cc05fc3b498d8d59439c3fe1ba
Bill Yi [Fri, 16 Jun 2017 15:21:00 +0000 (15:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
d97c62a1da -s ours
Change-Id: I7414e3510ce29720a40a55c8dbd69c9a34be6d45
Neil Fuller [Fri, 16 Jun 2017 15:13:11 +0000 (15:13 +0000)]
Merge "Track movement of some libcore/tzdata files" am:
2ed8b06173 am:
de45dab9ed -s ours
am:
25a9e701b0 -s ours
Change-Id: I1e835e84e9006673a3de33c117ac3a648ff57c23
TreeHugger Robot [Fri, 16 Jun 2017 15:12:30 +0000 (15:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Neil Fuller [Fri, 16 Jun 2017 15:03:10 +0000 (15:03 +0000)]
Merge "Track movement of some libcore/tzdata files" am:
2ed8b06173
am:
de45dab9ed -s ours
Change-Id: I75073397ee931b4b10c11e369d0081c2b559c91a
Neil Fuller [Fri, 16 Jun 2017 14:51:10 +0000 (14:51 +0000)]
Merge "Track movement of some libcore/tzdata files"
am:
2ed8b06173
Change-Id: Icfe3e6bb1e0d19be462fb47c23cba1cf77c6bf20
Neil Fuller [Fri, 16 Jun 2017 14:37:15 +0000 (14:37 +0000)]
Merge "Track movement of some libcore/tzdata files"
Erik Kline [Fri, 16 Jun 2017 14:18:09 +0000 (14:18 +0000)]
Merge "Fixes for tetheroffload crashes" am:
5ac7a03f9f am:
eeb0b31afa
am:
2e290617c5 -s ours
Change-Id: I149fd3f3d542ac0c1c5a2f85536ec0efeec9aed8
Erik Kline [Fri, 16 Jun 2017 14:10:44 +0000 (14:10 +0000)]
Merge "Fixes for tetheroffload crashes" am:
5ac7a03f9f
am:
eeb0b31afa
Change-Id: I58c467be3482e01f84c9860e2b9d4b03713c1dbd
Erik Kline [Fri, 16 Jun 2017 14:03:10 +0000 (14:03 +0000)]
Merge "Fixes for tetheroffload crashes"
am:
5ac7a03f9f
Change-Id: I08406513912c9fbd383625f10837085abb5c0516
Android Build Merger (Role) [Fri, 16 Jun 2017 13:51:35 +0000 (13:51 +0000)]
Merge "Merge "Merge "Fix two IndexOutOfBoundsException crashes." into oc-dev am:
ded5608f18" into oc-dev-plus-aosp am:
e1c75566e5" into oc-dr1-dev-plus-aosp
Julia Reynolds [Fri, 16 Jun 2017 13:50:33 +0000 (13:50 +0000)]
Merge "Merge "Fix two IndexOutOfBoundsException crashes." into oc-dev am:
ded5608f18" into oc-dev-plus-aosp
am:
e1c75566e5
Change-Id: I4285caedaed50bf49eada0b3ef3a5f08db660764
Treehugger Robot [Fri, 16 Jun 2017 13:49:56 +0000 (13:49 +0000)]
Merge "Fixes for tetheroffload crashes"
Android Build Merger (Role) [Fri, 16 Jun 2017 13:47:42 +0000 (13:47 +0000)]
Merge "Track movement of some libcore/tzdata files am:
3b5ae1e60f" into oc-dr1-dev-plus-aosp
Neil Fuller [Fri, 16 Jun 2017 13:44:26 +0000 (13:44 +0000)]
Track movement of some libcore/tzdata files
am:
3b5ae1e60f
Change-Id: Ib2aef33b8c48e8bd1e727cea3274927c467a2860
Julia Reynolds [Fri, 16 Jun 2017 13:43:27 +0000 (13:43 +0000)]
Merge "Fix two IndexOutOfBoundsException crashes." into oc-dev am:
ded5608f18
am:
5caa419730
Change-Id: I9f26b5fbe8842d08e575720e3637ea890b157ede
Android Build Merger (Role) [Fri, 16 Jun 2017 13:38:50 +0000 (13:38 +0000)]
Merge "Merge "Fix two IndexOutOfBoundsException crashes." into oc-dev am:
ded5608f18" into oc-dev-plus-aosp
Julia Reynolds [Fri, 16 Jun 2017 13:36:32 +0000 (13:36 +0000)]
Merge "Fix two IndexOutOfBoundsException crashes." into oc-dev
am:
ded5608f18
Change-Id: I925c6875249e15d2a497b619aba3d05d3644580e
Julia Reynolds [Fri, 16 Jun 2017 13:36:32 +0000 (13:36 +0000)]
Merge "Fix two IndexOutOfBoundsException crashes." into oc-dev
am:
ded5608f18
Change-Id: I32546aa6f7276a26b4e0419f83253110d83da01d
Sundeep Ghuman [Fri, 16 Jun 2017 13:32:33 +0000 (13:32 +0000)]
Merge "Revert "Update Status Bar with Badged Wifi Icons."" into oc-dr1-dev
am:
66b1223415
Change-Id: I4c758b028d0b6bf83ab38b70b17372902763d972
Julia Reynolds [Fri, 16 Jun 2017 13:30:29 +0000 (13:30 +0000)]
Merge "Fix two IndexOutOfBoundsException crashes." into oc-dev
TreeHugger Robot [Fri, 16 Jun 2017 13:23:22 +0000 (13:23 +0000)]
Merge "Revert "Update Status Bar with Badged Wifi Icons."" into oc-dr1-dev
Bill Yi [Fri, 16 Jun 2017 12:16:09 +0000 (05:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icb9547e4d5fb47bfab83f8012358047189787fda
Auto-generated-cl: translation import
Erik Kline [Thu, 15 Jun 2017 09:06:34 +0000 (18:06 +0900)]
Fixes for tetheroffload crashes
Now that we can talk to the HALs (with some out of tree CLs and
"setenforce 0"), several crashes were encountered.
Fixes here include:
- avoid hidl_handle move semantics
- check HIDL method status return value (isOk())
- convert Java short port numbers to ints
- don't pass nulls to HIDL where Strings are required
(limitations in parceling)
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- "setenforce 0" and start tethering
Bug:
29337859
Bug:
32163131
Merged-In: I5fa930be0c9eda491cf17bd4de9b55ab33672d25
Merged-In: Id1037d22826f4d426bccfa17dce0962c54518d64
Change-Id: I91314440c3a04e5f2502579b5f06dac9f25cf0cd
(cherry picked from commit
1185459c4169891bd7550655218e738c8bf1abe2)
Bill Yi [Fri, 16 Jun 2017 12:06:48 +0000 (05:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: I71afe3f16b8dc5c52a2780c1c1e0b9fd3071501f
Auto-generated-cl: translation import
Neil Fuller [Tue, 13 Jun 2017 14:12:17 +0000 (15:12 +0100)]
Track movement of some libcore/tzdata files
Some files in libcore/tzdata are moving to system/timezone
under the package com.android.timezone.distro.
To run tests:
make -j30 FrameworksServicesTests
adb install -r -g "out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w com.android.frameworks.servicestests \
"com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
Test: See above.
Bug:
31008728
Merged-In: I2600dd4bee22a571b9eb7303733591b60d1a8b2a
Change-Id: I2600dd4bee22a571b9eb7303733591b60d1a8b2a
Neil Fuller [Tue, 13 Jun 2017 14:12:17 +0000 (15:12 +0100)]
Track movement of some libcore/tzdata files
Some files in libcore/tzdata are moving to system/timezone
under the package com.android.timezone.distro.
To run tests:
make -j30 FrameworksServicesTests
adb install -r -g "out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w com.android.frameworks.servicestests \
"com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
Test: See above.
Bug:
31008728
Change-Id: I2600dd4bee22a571b9eb7303733591b60d1a8b2a
Jack He [Fri, 16 Jun 2017 11:12:25 +0000 (11:12 +0000)]
Merge "Bluetooth: Change keyboard icon to normal system color" into oc-dr1-dev
am:
a0c6ea0eaa
Change-Id: Ifc91dd54dab738b9f48533fe8b0a4321a407c3b5
TreeHugger Robot [Fri, 16 Jun 2017 11:06:54 +0000 (11:06 +0000)]
Merge "Bluetooth: Change keyboard icon to normal system color" into oc-dr1-dev
Erik Kline [Fri, 16 Jun 2017 10:35:22 +0000 (10:35 +0000)]
Merge "Fixes for tetheroffload crashes" into oc-dr1-dev
am:
b71e5377f2
Change-Id: Id1037d22826f4d426bccfa17dce0962c54518d64
TreeHugger Robot [Fri, 16 Jun 2017 10:28:24 +0000 (10:28 +0000)]
Merge "Fixes for tetheroffload crashes" into oc-dr1-dev
OSDN Git Service
