OSDN Git Service
Pankaj Kanwar [Tue, 13 Jun 2017 20:50:15 +0000 (20:50 +0000)]
Merge "Radio Interface changes to pass the encryption object, including the key,to the modem." am:
aadb414f02 am:
717b5bf3e0
am:
8532bc3b59
Change-Id: Idd49ae115d660cb21ed7baf4e66f5ec0f89e3e53
Pankaj Kanwar [Tue, 13 Jun 2017 20:38:46 +0000 (20:38 +0000)]
Merge "Radio Interface changes to pass the encryption object, including the key,to the modem." am:
aadb414f02
am:
717b5bf3e0
Change-Id: I8133ca2e269f74dd2c7b8a17f81de24567fcdc2e
Pankaj Kanwar [Tue, 13 Jun 2017 20:30:36 +0000 (20:30 +0000)]
Merge "Radio Interface changes to pass the encryption object, including the key,to the modem."
am:
aadb414f02
Change-Id: I2f2189aa6483dfe17fe6ed7f42e8b23166c67444
Pankaj Kanwar [Tue, 13 Jun 2017 20:22:22 +0000 (20:22 +0000)]
Merge "Radio Interface changes to pass the encryption object, including the key,to the modem."
Adrian Roos [Tue, 13 Jun 2017 19:25:52 +0000 (19:25 +0000)]
Merge "AOD: Use double tap coordinates to trigger Ambient Indication" into oc-dr1-dev
am:
2402522553
Change-Id: I22486ede65b6a07683cea4b8f5c48de94ae7a148
TreeHugger Robot [Tue, 13 Jun 2017 19:17:37 +0000 (19:17 +0000)]
Merge "AOD: Use double tap coordinates to trigger Ambient Indication" into oc-dr1-dev
Android Build Merger (Role) [Tue, 13 Jun 2017 19:09:50 +0000 (19:09 +0000)]
Merge "Merge "Binder: Add more logging on Error" am:
d9f3a3cf37 am:
e3bda6170d am:
6d908413bd" into oc-dr1-dev-plus-aosp
Andreas Gampe [Tue, 13 Jun 2017 19:08:54 +0000 (19:08 +0000)]
Merge "Binder: Add more logging on Error" am:
d9f3a3cf37 am:
e3bda6170d
am:
6d908413bd
Change-Id: I828b2dca2109334d27f43f9bc04c00214d14ba1e
Android Build Merger (Role) [Tue, 13 Jun 2017 19:08:22 +0000 (19:08 +0000)]
Merge "Merge "Address issues surrounding freezing by display." into oc-dev am:
8ab4d11145 am:
c717e603b1" into oc-dr1-dev-plus-aosp
Bryce Lee [Tue, 13 Jun 2017 19:07:25 +0000 (19:07 +0000)]
Merge "Address issues surrounding freezing by display." into oc-dev am:
8ab4d11145
am:
c717e603b1
Change-Id: I584661bb20175ef11e761ce87c629de9f7b29dc6
Bryce Lee [Tue, 13 Jun 2017 19:03:56 +0000 (19:03 +0000)]
Merge "Address issues surrounding freezing by display." into oc-dev am:
8ab4d11145
am:
fb385a6c15
Change-Id: I384de2479a69df5a6463586d87eb3cd5b2eebcbe
Andreas Gampe [Tue, 13 Jun 2017 19:02:21 +0000 (19:02 +0000)]
Merge "Binder: Add more logging on Error" am:
d9f3a3cf37
am:
e3bda6170d
Change-Id: Iec158813e6892fba5449219e32a7201fae142037
Bryce Lee [Tue, 13 Jun 2017 18:56:53 +0000 (18:56 +0000)]
Merge "Address issues surrounding freezing by display." into oc-dev
am:
8ab4d11145
Change-Id: If9ec8e8492ed8249cc99dfe05e97a0cf62ff8dd8
Bryce Lee [Tue, 13 Jun 2017 18:56:52 +0000 (18:56 +0000)]
Merge "Address issues surrounding freezing by display." into oc-dev
am:
8ab4d11145
Change-Id: I5eec6ff604056b7095ac07afd9721a5223a584d8
Bryce Lee [Tue, 13 Jun 2017 18:50:57 +0000 (18:50 +0000)]
Merge "Address issues surrounding freezing by display." into oc-dev
Andreas Gampe [Tue, 13 Jun 2017 18:45:27 +0000 (18:45 +0000)]
Merge "Binder: Add more logging on Error"
am:
d9f3a3cf37
Change-Id: I58eb483fff9fa9c4f2519fbd842172f48f1052e9
Andreas Gampe [Tue, 13 Jun 2017 18:34:45 +0000 (18:34 +0000)]
Merge "Binder: Add more logging on Error"
Adrian Roos [Fri, 2 Jun 2017 19:50:38 +0000 (12:50 -0700)]
AOD: Use double tap coordinates to trigger Ambient Indication
Bug:
38386446
Test: Double tap on AOD, verify that it still works. On device that supports double tap coordinates, verify that double tapping on ambient music opens ambient music.
Change-Id: Ic75ba731a980c9598c85927e83d2032f01da4822
(cherry picked from commit
44198f5124743f0d603eb4efa3b436bd96f32144)
Narayan Kamath [Tue, 13 Jun 2017 15:53:15 +0000 (15:53 +0000)]
Merge changes I73ae8de1,I58260902 am:
6f11744adc am:
a506180804
am:
d1941e51a6
Change-Id: I0b5e2850cd3710638660d0c58ed7c9cde869726f
Narayan Kamath [Tue, 13 Jun 2017 15:45:48 +0000 (15:45 +0000)]
Merge changes I73ae8de1,I58260902 am:
6f11744adc
am:
a506180804
Change-Id: I572de6f022670cd14223ada2f5fe6cf6f7a87a98
Narayan Kamath [Tue, 13 Jun 2017 15:38:42 +0000 (15:38 +0000)]
Merge changes I73ae8de1,I58260902
am:
6f11744adc
Change-Id: I9b47ae1d3953280a627584902b3bc099e1f907c8
pkanwar [Mon, 22 May 2017 22:23:38 +0000 (15:23 -0700)]
Radio Interface changes to pass the encryption object, including the
key,to the modem.
We will now pass the ImsiEncryptionInfo object which includes mnc/mcc.
BUG:
35606429
Test: manual
Change-Id: Idf835d9b99a26cb0c0d73fb70ffa9875843ac62b
Treehugger Robot [Tue, 13 Jun 2017 15:27:09 +0000 (15:27 +0000)]
Merge changes I73ae8de1,I58260902
* changes:
Binder: Log details of pending exception.
Binder: Be forceful about a forceful exit.
Bryce Lee [Mon, 12 Jun 2017 21:12:29 +0000 (14:12 -0700)]
Address issues surrounding freezing by display.
The first issue is the animating a display as a consequence of the
freezing due to configuration change during construction. This
additional animation is not expected and interferes with tests
expecting for the original display contents to be shown intact. This
CL addresses the issue by not freezing while the display is not ready
(before construction is finished).
The second problem addressed is book-keeping for
DisplayContentsAnimators in WindowAnimator. Currently, a getter
method is used internally to reference these animators, which
generates them if not present and adds them to the animation
iteration. In the case we set an animation on a display that no
longer exists (which can be the case after unfreezing), we end up
recreating this object. This can lead to us trying to animate a
non-existent DisplayContent. This CL prevents creating an animator
for a non-existent display and adjusts the methods using this getter
to handle this case.
Fixes:
62460846
Fixes:
62461229
Bug:
35486733
Bug:
62541591
Test: go/wm-smoke
Test: open and close projected android auto mode repeatedly and
ensure display correctness
Test: cts-tradefed run singleCommand cts-dev --module CtsMediaTestCases --test android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay
Change-Id: I60ade6f97440c8fa01b10e36c019865cf1fd0730
Android Build Merger (Role) [Tue, 13 Jun 2017 10:52:24 +0000 (10:52 +0000)]
Merge "Merge "Eagerly serialize historical sessions" into oc-dev am:
c7ea7effde am:
7ba9c4dc62" into oc-dr1-dev-plus-aosp
Narayan Kamath [Tue, 13 Jun 2017 10:50:44 +0000 (10:50 +0000)]
Merge "Eagerly serialize historical sessions" into oc-dev am:
c7ea7effde
am:
17652d85ec
Change-Id: Ieb233fb57cddf68e282779ce0eb193abd1300de6
Narayan Kamath [Tue, 13 Jun 2017 10:50:43 +0000 (10:50 +0000)]
Merge "Eagerly serialize historical sessions" into oc-dev am:
c7ea7effde
am:
7ba9c4dc62
Change-Id: I57639e4d18b04adf94d4da235cce5e957e88641e
Narayan Kamath [Tue, 13 Jun 2017 10:40:48 +0000 (10:40 +0000)]
Merge "Eagerly serialize historical sessions" into oc-dev
am:
c7ea7effde
Change-Id: Ice68d0de34795a23d9d7364244d564bc48a7d436
Narayan Kamath [Tue, 13 Jun 2017 10:40:46 +0000 (10:40 +0000)]
Merge "Eagerly serialize historical sessions" into oc-dev
am:
c7ea7effde
Change-Id: Iff55674bc989986e14d0bcea3c71bad5751d4dcb
Narayan Kamath [Tue, 13 Jun 2017 10:32:22 +0000 (10:32 +0000)]
Merge "Eagerly serialize historical sessions" into oc-dev
Narayan Kamath [Mon, 12 Jun 2017 12:34:29 +0000 (13:34 +0100)]
Eagerly serialize historical sessions
mHistoricalSessions maintained a strong reference to a PackageInstallerSession,
which in turn kept references to Bitmaps and other heavy-weight objects around.
Since this field is primarily used for debugging, this change replaces it with
a String dump of the session in question. Each dump takes about 600bytes, which
is comparable to the sizes of the un-serialized raw objects.
Bug:
62485552
Test: Manual
Change-Id: I4949a64b538ab4a97384f4f8bc9a6ef155a4b128
Erik Kline [Tue, 13 Jun 2017 08:42:44 +0000 (08:42 +0000)]
Merge "make UpsreamNetworkMonitor the sole source of upstream network information" am:
30a1cf96bb am:
cfaeabb3e3
am:
4bcce2b2ef
Change-Id: Ifeb49f1b19ab36e438763b569c78a335b094f7d0
Erik Kline [Tue, 13 Jun 2017 08:36:14 +0000 (08:36 +0000)]
Merge "make UpsreamNetworkMonitor the sole source of upstream network information" am:
30a1cf96bb
am:
cfaeabb3e3
Change-Id: Idfebb9b79074f21aeccf773cac98aa7839bda9da
Erik Kline [Tue, 13 Jun 2017 08:29:06 +0000 (08:29 +0000)]
Merge "make UpsreamNetworkMonitor the sole source of upstream network information"
am:
30a1cf96bb
Change-Id: I0f7234363f94694ecc4e97d87c7ffb6bb244895d
Erik Kline [Tue, 13 Jun 2017 08:20:40 +0000 (08:20 +0000)]
Merge "make UpsreamNetworkMonitor the sole source of upstream network information"
Adam Vartanian [Tue, 13 Jun 2017 08:19:16 +0000 (08:19 +0000)]
Merge "DO NOT MERGE Remove createSocket(Socket, InputStream, boolean) from APIs." into oc-dr1-dev
am:
87587fbda2
Change-Id: I669d80114ed83231205da0a608ee8e7cdfa8956c
Adam Vartanian [Tue, 13 Jun 2017 08:13:28 +0000 (08:13 +0000)]
Merge "DO NOT MERGE Remove createSocket(Socket, InputStream, boolean) from APIs." into oc-dr1-dev
Erik Kline [Tue, 13 Jun 2017 03:41:18 +0000 (03:41 +0000)]
Merge "Only disable Wi-Fi IP serving on specific interface, if available" am:
6428e1a4d4 am:
e675273dbc
am:
e13b93c585
Change-Id: Iac19359fd8712fa6a135f31bed9f0da97b3f2977
Erik Kline [Tue, 13 Jun 2017 03:34:55 +0000 (03:34 +0000)]
Merge "Only disable Wi-Fi IP serving on specific interface, if available" am:
6428e1a4d4
am:
e675273dbc
Change-Id: I99b170ebacc4135d1a09ce1ec3d43f76c6765de4
Erik Kline [Tue, 13 Jun 2017 03:25:12 +0000 (03:25 +0000)]
Merge "Only disable Wi-Fi IP serving on specific interface, if available"
am:
6428e1a4d4
Change-Id: I51f2e1864f5aaf1369e980f44537ab4f4a0e703e
Treehugger Robot [Tue, 13 Jun 2017 03:13:18 +0000 (03:13 +0000)]
Merge "Only disable Wi-Fi IP serving on specific interface, if available"
Erik Kline [Fri, 9 Jun 2017 08:08:52 +0000 (17:08 +0900)]
make UpsreamNetworkMonitor the sole source of upstream network information
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Change-Id: I66ce682cf9c31887264a095a4e4638d281d8ed39
Android Build Merger (Role) [Tue, 13 Jun 2017 02:41:43 +0000 (02:41 +0000)]
Merge "Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
7fc501184a -s ours" into oc-dr1-dev am:
2eb4ec0e72 -s ours" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 13 Jun 2017 02:41:01 +0000 (02:41 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
7fc501184a -s ours am:
15094560a4 -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Tue, 13 Jun 2017 02:40:48 +0000 (02:40 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
7fc501184a -s ours" into oc-dr1-dev
am:
2eb4ec0e72 -s ours
Change-Id: I2447e12325c6ef7d6152c17c1b7a6236b0aae313
Bill Yi [Tue, 13 Jun 2017 02:38:30 +0000 (02:38 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
7fc501184a -s ours
am:
15094560a4 -s ours
Change-Id: I515e92a539513b308fc79ae7127d074819bc3a73
Bill Yi [Tue, 13 Jun 2017 02:38:29 +0000 (02:38 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
34cfd78f8e -s ours
Change-Id: Iccdd50aca254ad54a1c34ec3dd1d37d494f04f7f
Android Build Merger (Role) [Tue, 13 Jun 2017 02:32:13 +0000 (02:32 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
7fc501184a -s ours" into oc-dr1-dev
Bill Yi [Tue, 13 Jun 2017 02:31:28 +0000 (02:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
7fc501184a -s ours
Change-Id: I62669a422c38856f0d164a149f6415e59e2b81d4
TreeHugger Robot [Tue, 13 Jun 2017 02:31:23 +0000 (02:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Tue, 13 Jun 2017 02:30:19 +0000 (02:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
7fc501184a -s ours
Change-Id: I418c08d5f5bf997d7e870bafc2a0b68f519dd990
Bill Yi [Tue, 13 Jun 2017 02:30:08 +0000 (02:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
1190614529 -s ours
Change-Id: Ide4638e5f3a11cc9457cf9ddbf61ecf748967491
Erik Kline [Fri, 9 Jun 2017 07:36:29 +0000 (16:36 +0900)]
Only disable Wi-Fi IP serving on specific interface, if available
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Change-Id: Ifd9131bad20810ee24c9436d8c0df7a81fae11d5
TreeHugger Robot [Tue, 13 Jun 2017 02:20:34 +0000 (02:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Tue, 13 Jun 2017 02:18:42 +0000 (02:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Andreas Gampe [Mon, 12 Jun 2017 17:43:05 +0000 (10:43 -0700)]
Binder: Add more logging on Error
Try to add the Error's message to the abort, so that it shows up
when the logcat is missing.
Sample message:
'jni_internal.cc:508] JNI FatalError called: java.lang.Error thrown during binder transaction: java.lang.LinkageError: This is a test.'
Bug:
62514767
Test: m
Change-Id: I12026bb7a8ec9438db493f135ed5d0177187f702
Winson Chung [Tue, 13 Jun 2017 01:51:00 +0000 (01:51 +0000)]
Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev am:
b1cdc17dfb
am:
87997ce838
Change-Id: Ib22c951e0e17c90a13b9b4e5697eb5127a1011ba
Android Build Merger (Role) [Tue, 13 Jun 2017 01:48:14 +0000 (01:48 +0000)]
Merge "Merge "[ErrorProne] Fix Error Prone warnings in aware/p2p code" into oc-dr1-dev am:
43dc06a9a9" into oc-dr1-dev-plus-aosp
Etan Cohen [Tue, 13 Jun 2017 01:46:09 +0000 (01:46 +0000)]
Merge "[ErrorProne] Fix Error Prone warnings in aware/p2p code" into oc-dr1-dev
am:
43dc06a9a9
Change-Id: I5d163be24053eba0592dddf637fdd89373c8fa15
Winson Chung [Tue, 13 Jun 2017 01:45:31 +0000 (01:45 +0000)]
Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev am:
b1cdc17dfb
am:
ebc74796e4
Change-Id: Id4818ff5e203cb2aa40079ed7af24c4b84a957ba
Winson Chung [Tue, 13 Jun 2017 01:41:18 +0000 (01:41 +0000)]
Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev
am:
b1cdc17dfb
Change-Id: I987d923b923e289baa76d5155cf6a7fe4d9ece6a
Winson Chung [Tue, 13 Jun 2017 01:37:34 +0000 (01:37 +0000)]
Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev
am:
b1cdc17dfb
Change-Id: I54fcc6a340e24beae112fcd5753a1b60bb586c24
TreeHugger Robot [Tue, 13 Jun 2017 01:34:43 +0000 (01:34 +0000)]
Merge "[ErrorProne] Fix Error Prone warnings in aware/p2p code" into oc-dr1-dev
Android Build Merger (Role) [Tue, 13 Jun 2017 01:19:42 +0000 (01:19 +0000)]
Merge "Merge "Protect broadcast used in settings for bond cancel" into oc-dev am:
68a4c91bb4 am:
2ddb92f2d9" into oc-dr1-dev-plus-aosp
Marie Janssen [Tue, 13 Jun 2017 01:18:53 +0000 (01:18 +0000)]
Merge "Protect broadcast used in settings for bond cancel" into oc-dev am:
68a4c91bb4
am:
2ddb92f2d9
Change-Id: Iede1ea0f5f9409538295b3861e2343647ba51026
TreeHugger Robot [Tue, 13 Jun 2017 01:18:45 +0000 (01:18 +0000)]
Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev
Android Build Merger (Role) [Tue, 13 Jun 2017 01:18:26 +0000 (01:18 +0000)]
Merge "Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev am:
e1e0db8ca9 am:
5323b2d4cd" into oc-dr1-dev-plus-aosp
Wale Ogunwale [Tue, 13 Jun 2017 01:17:33 +0000 (01:17 +0000)]
Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev am:
e1e0db8ca9
am:
5323b2d4cd
Change-Id: I659c818c815b46d666986b1a1224fd4d4f57e56e
Android Build Merger (Role) [Tue, 13 Jun 2017 01:17:15 +0000 (01:17 +0000)]
Merge "Merge "Protect broadcast used in settings for bond cancel" into oc-dev am:
68a4c91bb4 am:
4c342c8a98" into oc-dr1-dev-plus-aosp
Tianjie Xu [Tue, 13 Jun 2017 01:14:58 +0000 (01:14 +0000)]
Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev am:
f40f297546
am:
c7fed42403
Change-Id: I196fe22ce901383f3349b99823f066d1226fa4fb
Marie Janssen [Tue, 13 Jun 2017 01:14:33 +0000 (01:14 +0000)]
Merge "Protect broadcast used in settings for bond cancel" into oc-dev am:
68a4c91bb4
am:
4c342c8a98
Change-Id: Ia608d4af6afda14097a94013bf2dbe64962ebd74
Android Build Merger (Role) [Tue, 13 Jun 2017 01:10:52 +0000 (01:10 +0000)]
Merge "Merge "Address IMSI privacy issues." am:
ef6b81e5b2 am:
91a4d3df01 am:
3f095ca368" into oc-dr1-dev-plus-aosp
Pankaj Kanwar [Tue, 13 Jun 2017 01:09:44 +0000 (01:09 +0000)]
Merge "Address IMSI privacy issues." am:
ef6b81e5b2 am:
91a4d3df01
am:
3f095ca368
Change-Id: I3f9a2f48e8b45b7625c364983b2b3d342e70d5d0
Android Build Merger (Role) [Tue, 13 Jun 2017 01:09:16 +0000 (01:09 +0000)]
Merge "Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev am:
e1e0db8ca9 am:
90159a2492" into oc-dr1-dev-plus-aosp
Wale Ogunwale [Tue, 13 Jun 2017 01:08:25 +0000 (01:08 +0000)]
Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev am:
e1e0db8ca9
am:
90159a2492
Change-Id: I0092411f5b8bef853b55e6ffe7bdf700876f7715
Robert Carr [Tue, 13 Jun 2017 01:06:32 +0000 (01:06 +0000)]
Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev am:
42b3610adc
am:
aec6b4749a
Change-Id: Ic8bbda9b2fc76253c70e9f5cd15d6a32b212b50d
Marie Janssen [Tue, 13 Jun 2017 01:04:55 +0000 (01:04 +0000)]
Merge "Protect broadcast used in settings for bond cancel" into oc-dev
am:
68a4c91bb4
Change-Id: Ifdb4b625f21dcda5248071263aaf6936158efb39
Wale Ogunwale [Tue, 13 Jun 2017 01:01:51 +0000 (01:01 +0000)]
Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev
am:
e1e0db8ca9
Change-Id: I2d854e36c31a8fa1cf74e5c5a536969ee94dc79b
Tianjie Xu [Tue, 13 Jun 2017 00:58:53 +0000 (00:58 +0000)]
Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev
am:
f40f297546
Change-Id: Id60cf7cf4b82f17fd094fa011bb54a543e636f48
Jorim Jaggi [Tue, 13 Jun 2017 00:54:18 +0000 (00:54 +0000)]
Merge "Attempted fix for navigation bar flicker" into oc-dev am:
bbd7dfc0a4
am:
20eb74681f
Change-Id: I9dc34fe898c8ce9f5c1babfa73bf619c0e69a494
Robert Carr [Tue, 13 Jun 2017 00:54:10 +0000 (00:54 +0000)]
Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev
am:
42b3610adc
Change-Id: I3238399a26917f80bd4e33bb20142f62076e6f4f
Marie Janssen [Tue, 13 Jun 2017 00:51:09 +0000 (00:51 +0000)]
Merge "Protect broadcast used in settings for bond cancel" into oc-dev
am:
68a4c91bb4
Change-Id: I3dc46eca98c859c540d528cb8a4a409587a25383
Android Build Merger (Role) [Tue, 13 Jun 2017 00:49:12 +0000 (00:49 +0000)]
Merge "Merge "Improve developer docs for storage APIs." into oc-dev am:
05b52d8ba5 am:
0ba24ed694" into oc-dr1-dev-plus-aosp
Jeff Sharkey [Tue, 13 Jun 2017 00:48:06 +0000 (00:48 +0000)]
Merge "Improve developer docs for storage APIs." into oc-dev am:
05b52d8ba5
am:
0ba24ed694
Change-Id: I8a33e050caba8a7f80b64709174a867a50857571
Android Build Merger (Role) [Tue, 13 Jun 2017 00:47:37 +0000 (00:47 +0000)]
Merge "Merge "Don't log all instant app resolutions" into oc-dev am:
3ef0b8260f am:
f734de79cc" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 13 Jun 2017 00:47:18 +0000 (00:47 +0000)]
Merge "Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev am:
f40f297546 am:
d04d501ce7" into oc-dr1-dev-plus-aosp
Todd Kennedy [Tue, 13 Jun 2017 00:46:50 +0000 (00:46 +0000)]
Merge "Don't log all instant app resolutions" into oc-dev am:
3ef0b8260f
am:
f734de79cc
Change-Id: Ie507e44ad423296de9ab545c1afcd881273b30e1
Android Build Merger (Role) [Tue, 13 Jun 2017 00:46:20 +0000 (00:46 +0000)]
Merge "Merge changes from topic 'sysui-tooltip' into oc-dev am:
3fbcec5b86 am:
bc168cf9d5" into oc-dr1-dev-plus-aosp
Tianjie Xu [Tue, 13 Jun 2017 00:46:27 +0000 (00:46 +0000)]
Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev am:
f40f297546
am:
d04d501ce7
Change-Id: Ide407c6ccc5a42c9a57acb1652b19db99bee42a8
Android Build Merger (Role) [Tue, 13 Jun 2017 00:45:55 +0000 (00:45 +0000)]
Merge "Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev am:
42b3610adc am:
2fa5800da9" into oc-dr1-dev-plus-aosp
TreeHugger Robot [Tue, 13 Jun 2017 00:45:40 +0000 (00:45 +0000)]
Merge "Protect broadcast used in settings for bond cancel" into oc-dev
Vladislav Kaznacheev [Tue, 13 Jun 2017 00:45:32 +0000 (00:45 +0000)]
Merge changes from topic 'sysui-tooltip' into oc-dev am:
3fbcec5b86
am:
bc168cf9d5
Change-Id: I5b2320564692df6fa14bfeb49fcf350fc4cb2d9d
Pankaj Kanwar [Tue, 13 Jun 2017 00:45:04 +0000 (00:45 +0000)]
Merge "Address IMSI privacy issues." am:
ef6b81e5b2
am:
91a4d3df01
Change-Id: I15e60cbbff06d7f66e86d755ae87b2e3513ca4a9
Robert Carr [Tue, 13 Jun 2017 00:43:56 +0000 (00:43 +0000)]
Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev am:
42b3610adc
am:
2fa5800da9
Change-Id: I83c4a2e592b7385b1aa6dc3157bd6ea5950c624a
Bill Yi [Tue, 13 Jun 2017 00:43:00 +0000 (00:43 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
7c2a12b658 -s ours
am:
5a3998fe38 -s ours
Change-Id: Ic55a5b3c7cc13af454abc3fbb4f1dba7be64d107
Jorim Jaggi [Tue, 13 Jun 2017 00:41:40 +0000 (00:41 +0000)]
Merge "Attempted fix for navigation bar flicker" into oc-dev
am:
bbd7dfc0a4
Change-Id: I80a618eb59f0479060a69ca4f0be8ac883a8d48d
Android Build Merger (Role) [Tue, 13 Jun 2017 00:39:21 +0000 (00:39 +0000)]
Merge "Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev am:
71029bf631 am:
938fe5c968" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 13 Jun 2017 00:39:07 +0000 (00:39 +0000)]
Merge "Merge "Attempted fix for navigation bar flicker" into oc-dev am:
bbd7dfc0a4 am:
78c9744f41" into oc-dr1-dev-plus-aosp
Will Brazil [Tue, 13 Jun 2017 00:38:29 +0000 (00:38 +0000)]
Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev am:
71029bf631
am:
938fe5c968
Change-Id: I147dea17afffba890b5bb3108d061bdf4f7c76f7
Jorim Jaggi [Tue, 13 Jun 2017 00:38:04 +0000 (00:38 +0000)]
Merge "Attempted fix for navigation bar flicker" into oc-dev am:
bbd7dfc0a4
am:
78c9744f41
Change-Id: I985f319bb1cf6627abef2a7dafd9fafd64309264
OSDN Git Service
