OSDN Git Service
Andrew Solovay [Fri, 7 Jul 2017 19:08:56 +0000 (19:08 +0000)]
Merge "docs: Described why ProgressDialog is now deprecated." into oc-dev
am:
1cdf4244f4
Change-Id: I295298edcd7f26df46edb71924fa63038a381619
Andrew Solovay [Fri, 7 Jul 2017 19:02:48 +0000 (19:02 +0000)]
Merge "docs: Described why ProgressDialog is now deprecated." into oc-dev
Android Build Merger (Role) [Fri, 7 Jul 2017 07:47:44 +0000 (07:47 +0000)]
Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master am:
9dcf614397" into oc-dev-plus-aosp
Android Build Merger (Role) [Fri, 7 Jul 2017 07:46:46 +0000 (07:46 +0000)]
Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master am:
9dcf614397" into oc-dev-plus-aosp
Adam Vartanian [Fri, 7 Jul 2017 07:46:33 +0000 (07:46 +0000)]
Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master
am:
9dcf614397
Change-Id: I2d9a30cb879a2b689f5519b8d4c066de1265f0df
Android Build Merger (Role) [Fri, 7 Jul 2017 07:45:52 +0000 (07:45 +0000)]
Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd am:
2886890793" into oc-dev-plus-aosp
Adam Vartanian [Fri, 7 Jul 2017 07:45:45 +0000 (07:45 +0000)]
Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master
am:
9dcf614397
Change-Id: Ib2abfdf4a3d445a3e404877d6187480f86e4956f
Adam Vartanian [Fri, 7 Jul 2017 07:44:34 +0000 (07:44 +0000)]
Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd
am:
2886890793
Change-Id: I0757cbf92a049cc20226172b6d3261f5ef23b362
Adam Vartanian [Fri, 7 Jul 2017 07:43:53 +0000 (07:43 +0000)]
Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd
am:
2886890793
Change-Id: I6b5e764a2b8653937c0edaaa6b9450973a38dac4
Android Build Merger (Role) [Fri, 7 Jul 2017 07:38:38 +0000 (07:38 +0000)]
Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master
Adam Vartanian [Fri, 7 Jul 2017 07:37:18 +0000 (07:37 +0000)]
Merge "Streamline testInstall_compatibleContext()"
am:
476d58c6bd
Change-Id: Ib9c11cb5d7cf80f6dc8695d3b3c28f82854f3617
Adam Vartanian [Fri, 7 Jul 2017 07:36:34 +0000 (07:36 +0000)]
Merge "Streamline testInstall_compatibleContext()"
am:
476d58c6bd
Change-Id: I99631c3166ced487e990f28f0e7c10c180d6473a
Adam Vartanian [Fri, 7 Jul 2017 07:27:29 +0000 (07:27 +0000)]
Merge "Streamline testInstall_compatibleContext()"
Robert Carr [Fri, 7 Jul 2017 03:22:53 +0000 (03:22 +0000)]
Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev
am:
401b8907d0
Change-Id: I10b683e78ea75a1ca9cdd4e31317aa7f284ac046
TreeHugger Robot [Fri, 7 Jul 2017 03:10:12 +0000 (03:10 +0000)]
Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev
Android Build Merger (Role) [Thu, 6 Jul 2017 23:04:57 +0000 (23:04 +0000)]
Merge "Merge changes from topic 'am-
638c543cf14f446eae62e5f283001253' into stage-aosp-master am:
41d6995efa" into oc-dev-plus-aosp
Ruchi Kandoi [Thu, 6 Jul 2017 23:00:35 +0000 (23:00 +0000)]
Merge changes from topic 'am-
638c543cf14f446eae62e5f283001253' into stage-aosp-master
am:
41d6995efa
Change-Id: I49343d3ee533b8b567edf2c76b9fbc78ad2cd235
Android Build Merger (Role) [Thu, 6 Jul 2017 22:59:15 +0000 (22:59 +0000)]
Merge changes from topic 'am-
0fe9238e031841a8802281f7e75ee086' into oc-dev-plus-aosp
* changes:
Merge changes from topic 'NCI-2.0' am:
430dded515 am:
4d08be4a52
NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am:
e7ecebae11 am:
93d313b0a0
Ruchi Kandoi [Thu, 6 Jul 2017 22:56:47 +0000 (22:56 +0000)]
Merge changes from topic 'NCI-2.0' am:
430dded515
am:
4d08be4a52
Change-Id: Id2b2073acb3b901015b2b0d938a8cb5ee5a0270b
Ruchi Kandoi [Thu, 6 Jul 2017 22:56:19 +0000 (22:56 +0000)]
Merge changes from topic 'NCI-2.0' am:
430dded515
am:
4d08be4a52
Change-Id: Ie427005b3fa448a33c1756afdea66715914c4ff4
Love Khanna [Thu, 6 Jul 2017 22:55:46 +0000 (22:55 +0000)]
NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am:
e7ecebae11
am:
93d313b0a0
Change-Id: Iab0bd06f3f3a0d3f632e6bd5bedd8fb7c9831b90
Love Khanna [Thu, 6 Jul 2017 22:55:33 +0000 (22:55 +0000)]
NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am:
e7ecebae11
am:
93d313b0a0
Change-Id: If6952f71012f48a789c31775161720dd409bf40b
Robert Carr [Thu, 6 Jul 2017 22:28:34 +0000 (15:28 -0700)]
SurfaceView: Avoid initializing Surface from an invalid
SurfaceControl.
In a recent CL we introduced a call to Surface#createFrom, in order to
recreate the Surface object from the underlying SurfaceControl, as a
workaround to emulate when it was parcelled over binder in the past.
However this is causing BufferQueue abandoned errors when stopping and
resuming some applications. To understand them, we need to revisit the
SurfaceView destruction process when handling onStop.
First mWindowStopped will be set to true (SurfaceView#windowStopped),
and we should then enter updateSurface. Our requested visibility will
now be false and so we emit the Surface destroyed callbacks. Notice in
the finally block in mUpdateSurface, we will release mSurface, but we
will NOT null mSurfaceControl. Inline documentation explains why.
In the case that the activity is not actually being destroyed, it's
possible that we may not get a dispatchDetachedFromWindow. This means
that we will not null mSurfaceControl. Now if the activity is
un-stopped and we re-enter updateSurface we encounter a problem
state. "creating" will be set to false since mSurfaceControl != null,
however mSurfaceControl will not point to a valid surface.
Prior to the introduction of the #createFrom call, this unwanted state
didn't cause any problems. Because mSurface was released back in the
finally block as we were stopping we now fall out of the
mSurface.isValid() block in updateSurface. As we reach the finally
block again, we would now set mSurfaceControl=null since the app was
no longer stopped. Later when we reach updateSurface again (which
tends to happen quite often) it will now be null and we will correctly
set creating=true, create a valid SurfaceControl, and move along
happily. However following, the introduction of this
Surface#createFrom call we will now reinitialize the Surface from an
invalid underlying SurfaceControl. This means we will enter the
mSurface.isValid block, but will proceed to emit an invalid Surface to
the client in the callbacks.
We avoid this state by making creating=true even if
SurfaceControl=non-null when the calculated visibility changes from
invisible to visible.
Bug:
63251745
Test: Manual of app from bug and apps from previous related bugs. go/wm-smoke. Additional manual testing of many SV apps.
Change-Id: Icc32a34cac239d65267da705cc23feb23e1ceb67
Android Build Merger (Role) [Thu, 6 Jul 2017 22:52:32 +0000 (22:52 +0000)]
Merge changes from topic 'am-
638c543cf14f446eae62e5f283001253' into stage-aosp-master
* changes:
Merge changes from topic 'NCI-2.0' am:
430dded515
NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am:
e7ecebae11
Ruchi Kandoi [Thu, 6 Jul 2017 22:49:25 +0000 (22:49 +0000)]
Merge changes from topic 'NCI-2.0'
am:
430dded515
Change-Id: I3f56752a4c044c216bf1161ac778a349941ed541
Love Khanna [Thu, 6 Jul 2017 22:48:23 +0000 (22:48 +0000)]
NCI2.0 update LF_T3T_PARAMETERS of 18 byte.
am:
e7ecebae11
Change-Id: I285fa2cfb5e0cd34f0342d78f283c67a5ce8d7f1
Ruchi Kandoi [Thu, 6 Jul 2017 22:48:20 +0000 (22:48 +0000)]
Merge changes from topic 'NCI-2.0'
am:
430dded515
Change-Id: I264533bf8782ea66bd6959ca08f9699985273c9f
Love Khanna [Thu, 6 Jul 2017 22:47:08 +0000 (22:47 +0000)]
NCI2.0 update LF_T3T_PARAMETERS of 18 byte.
am:
e7ecebae11
Change-Id: Ic91ecb6a8dcb8529efda8eb0cdc99ca7758b66e6
Ruchi Kandoi [Thu, 6 Jul 2017 22:41:29 +0000 (22:41 +0000)]
Merge changes from topic 'NCI-2.0'
* changes:
AID suffix registration.
NCI2.0 update LF_T3T_PARAMETERS of 18 byte.
Android Build Merger (Role) [Thu, 6 Jul 2017 21:20:51 +0000 (21:20 +0000)]
Merge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f" into stage-aosp-master am:
dc17418da0" into oc-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 21:19:36 +0000 (21:19 +0000)]
Merge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f" into stage-aosp-master am:
dc17418da0" into oc-dev-plus-aosp
Alex Light [Thu, 6 Jul 2017 21:19:06 +0000 (21:19 +0000)]
Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f" into stage-aosp-master
am:
dc17418da0
Change-Id: Ice4b58746d888aacf759df70146817deaff39f51
Android Build Merger (Role) [Thu, 6 Jul 2017 21:18:31 +0000 (21:18 +0000)]
Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f am:
c9b8de6136" into oc-dev-plus-aosp
Alex Light [Thu, 6 Jul 2017 21:17:43 +0000 (21:17 +0000)]
Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f" into stage-aosp-master
am:
dc17418da0
Change-Id: Ic560028afab1b3918c32c10efd457331b17b6abc
Alex Light [Thu, 6 Jul 2017 21:16:51 +0000 (21:16 +0000)]
Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f
am:
c9b8de6136
Change-Id: If90472d31e9c46b9848d3aa29b548beecbe1978a
Alex Light [Thu, 6 Jul 2017 21:15:59 +0000 (21:15 +0000)]
Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f
am:
c9b8de6136
Change-Id: Ia613ba66564bb881339569055205165e5f4c00b1
Android Build Merger (Role) [Thu, 6 Jul 2017 21:13:29 +0000 (21:13 +0000)]
Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f" into stage-aosp-master
Alex Light [Thu, 6 Jul 2017 21:11:47 +0000 (21:11 +0000)]
Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor"
am:
a4267fd89f
Change-Id: I8cd6ee971686accf3cc832e7c0f5f18e8b4fbf2f
Android Build Merger (Role) [Thu, 6 Jul 2017 21:11:06 +0000 (21:11 +0000)]
Merge "Merge "Merge "Enable priority boost for non-Jack builds." am:
847c70da66" into stage-aosp-master am:
2e8ba8dd5c" into oc-dev-plus-aosp
Colin Cross [Thu, 6 Jul 2017 21:10:16 +0000 (21:10 +0000)]
Merge "Merge "Enable priority boost for non-Jack builds." am:
847c70da66" into stage-aosp-master
am:
2e8ba8dd5c
Change-Id: I0833d345749714ccd8a9feb9e1e495f540253fd0
Alex Light [Thu, 6 Jul 2017 21:10:11 +0000 (21:10 +0000)]
Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor"
am:
a4267fd89f
Change-Id: If31e5d218bd00b3281923c80cd4f61ca734d4388
Android Build Merger (Role) [Thu, 6 Jul 2017 21:09:50 +0000 (21:09 +0000)]
Merge "Merge "Merge "Enable priority boost for non-Jack builds." am:
847c70da66" into stage-aosp-master am:
2e8ba8dd5c" into oc-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 21:09:27 +0000 (21:09 +0000)]
Merge "Merge "Enable priority boost for non-Jack builds." am:
847c70da66 am:
24a1598b5b" into oc-dev-plus-aosp
Colin Cross [Thu, 6 Jul 2017 21:09:05 +0000 (21:09 +0000)]
Merge "Merge "Enable priority boost for non-Jack builds." am:
847c70da66" into stage-aosp-master
am:
2e8ba8dd5c
Change-Id: I8b8b8cfb2f8671726d1661e7e9b634f2ac374930
Colin Cross [Thu, 6 Jul 2017 21:08:21 +0000 (21:08 +0000)]
Merge "Enable priority boost for non-Jack builds." am:
847c70da66
am:
24a1598b5b
Change-Id: If65490df9f24444efa1040cfad1b2a1afe803afa
Colin Cross [Thu, 6 Jul 2017 21:07:27 +0000 (21:07 +0000)]
Merge "Enable priority boost for non-Jack builds." am:
847c70da66
am:
24a1598b5b
Change-Id: I8303e4193e4eccafa83253429b24bf9cc49234dc
Android Build Merger (Role) [Thu, 6 Jul 2017 21:04:29 +0000 (21:04 +0000)]
Merge "Merge "Enable priority boost for non-Jack builds." am:
847c70da66" into stage-aosp-master
Alex Light [Thu, 6 Jul 2017 21:03:24 +0000 (21:03 +0000)]
Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor"
Colin Cross [Thu, 6 Jul 2017 21:03:01 +0000 (21:03 +0000)]
Merge "Enable priority boost for non-Jack builds."
am:
847c70da66
Change-Id: Ie3e16e7452404b5d83d87c5f4d86abb94f7e1c6b
Colin Cross [Thu, 6 Jul 2017 21:02:04 +0000 (21:02 +0000)]
Merge "Enable priority boost for non-Jack builds."
am:
847c70da66
Change-Id: I2172acbf465cf19c3af7388309367b77750c4ac0
Colin Cross [Thu, 6 Jul 2017 20:48:31 +0000 (20:48 +0000)]
Merge "Enable priority boost for non-Jack builds."
Android Build Merger (Role) [Thu, 6 Jul 2017 20:28:02 +0000 (20:28 +0000)]
Merge "Merge "Log errors on android.os.VintfObject.verify()" am:
54b1e9c57c am:
90a5fd0549" into oc-dev-plus-aosp
Yifan Hong [Thu, 6 Jul 2017 20:27:08 +0000 (20:27 +0000)]
Merge "Log errors on android.os.VintfObject.verify()" am:
54b1e9c57c
am:
90a5fd0549
Change-Id: I241c75ad6dbf4a5a450b6b1a0e1f8e65d57c4632
Yifan Hong [Thu, 6 Jul 2017 20:26:21 +0000 (20:26 +0000)]
Merge "Log errors on android.os.VintfObject.verify()" am:
54b1e9c57c
am:
90a5fd0549
Change-Id: I6b96299e8480a7cdd64e6c3ca8ac1e3946971000
Yifan Hong [Thu, 6 Jul 2017 20:21:51 +0000 (20:21 +0000)]
Merge "Log errors on android.os.VintfObject.verify()"
am:
54b1e9c57c
Change-Id: I07f9797bcf9a32a3c9b517741e7cbef17d5a5382
Yifan Hong [Thu, 6 Jul 2017 19:48:26 +0000 (19:48 +0000)]
Merge "Log errors on android.os.VintfObject.verify()"
Alan Leung [Wed, 14 Jun 2017 20:50:45 +0000 (13:50 -0700)]
Enable priority boost for non-Jack builds.
Test: m ANDROID_COMPILE_WITH_JACK=false / checked for boost+reset calls.
BUG:
36791701
Change-Id: I5fb4107ae39e76644c01c502483ae7d887ab18a3
Merged-In: I5fb4107ae39e76644c01c502483ae7d887ab18a3
(cherry picked from commit
421baeb9289cd5a16e2fef5601dcddbbfad8eb3e)
Android Build Merger (Role) [Thu, 6 Jul 2017 19:00:56 +0000 (19:00 +0000)]
Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am:
040b774928" into oc-dev-plus-aosp
Andrew Solovay [Thu, 6 Jul 2017 18:59:28 +0000 (18:59 +0000)]
Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev
am:
040b774928
Change-Id: I502f2dcf60a9010f336b522005d6982d522d9b1d
Andrew Solovay [Thu, 6 Jul 2017 18:58:22 +0000 (18:58 +0000)]
Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev
am:
040b774928
Change-Id: I5fb70c606842dd5af7fdb5506d7a0d14e83aeab9
Andrew Solovay [Thu, 6 Jul 2017 18:42:13 +0000 (18:42 +0000)]
Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev
Android Build Merger (Role) [Thu, 6 Jul 2017 18:42:05 +0000 (18:42 +0000)]
Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master am:
7e97085ee7" into oc-dev-plus-aosp
Hall Liu [Thu, 6 Jul 2017 18:40:45 +0000 (18:40 +0000)]
Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master
am:
7e97085ee7
Change-Id: If496a76fc79f0f402e8a0c509f1d370903ab535a
Android Build Merger (Role) [Thu, 6 Jul 2017 18:39:03 +0000 (18:39 +0000)]
Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master am:
4c3be35123" into oc-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 18:38:02 +0000 (18:38 +0000)]
Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master am:
4c3be35123" into oc-dev-plus-aosp
Hall Liu [Thu, 6 Jul 2017 18:37:59 +0000 (18:37 +0000)]
Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master
am:
4c3be35123
Change-Id: I7a352def470a54916129fb9fc90239658847a02f
Hall Liu [Thu, 6 Jul 2017 18:36:42 +0000 (18:36 +0000)]
Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master
am:
4c3be35123
Change-Id: I3fe46bf58306211ca49557a8fc2131caf902b2cf
Android Build Merger (Role) [Thu, 6 Jul 2017 18:33:42 +0000 (18:33 +0000)]
Merge "Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27" into stage-aosp-master am:
785ab04d7a" into oc-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 18:33:32 +0000 (18:33 +0000)]
Merge "Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27" into stage-aosp-master am:
785ab04d7a" into oc-dev-plus-aosp
Fyodor Kupolov [Thu, 6 Jul 2017 18:32:42 +0000 (18:32 +0000)]
Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27" into stage-aosp-master
am:
785ab04d7a
Change-Id: I3f75c0bd9928013ce04b86a93e16f43eacb3a588
Fyodor Kupolov [Thu, 6 Jul 2017 18:32:37 +0000 (18:32 +0000)]
Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27" into stage-aosp-master
am:
785ab04d7a
Change-Id: I63d56be90cdf022d01fa2bf4b79d228f48e19eb1
Android Build Merger (Role) [Thu, 6 Jul 2017 18:32:12 +0000 (18:32 +0000)]
Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27 am:
481d92c517" into oc-dev-plus-aosp
Fyodor Kupolov [Thu, 6 Jul 2017 18:31:14 +0000 (18:31 +0000)]
Merge "Fix ContentObserver unregister issue" am:
09b6988e27
am:
481d92c517
Change-Id: Icad1a472602443fe5a4931cf6181411e15b4c68f
Fyodor Kupolov [Thu, 6 Jul 2017 18:30:44 +0000 (18:30 +0000)]
Merge "Fix ContentObserver unregister issue" am:
09b6988e27
am:
481d92c517
Change-Id: I2f6cfe7465a9816815172db2fb3defa8f49bdd31
Android Build Merger (Role) [Thu, 6 Jul 2017 18:26:39 +0000 (18:26 +0000)]
Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master
Android Build Merger (Role) [Thu, 6 Jul 2017 18:25:41 +0000 (18:25 +0000)]
Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master
Alex Light [Thu, 6 Jul 2017 18:25:18 +0000 (11:25 -0700)]
Unhide InMemoryDexClassLoader ByteBuffer[] constructor
This constructor lets one give multiple dex files as byte buffers for
the InMemoryDexClassLoader.
Bug:
63390204
Test: Builds
Change-Id: I5b8a7860dbc365c0a51dbaf4540b9fa53c922546
Hall Liu [Thu, 6 Jul 2017 18:24:49 +0000 (18:24 +0000)]
Merge "Add a reason arg to streamStateUpdated"
am:
6ba3829074
Change-Id: Ied8d6168fc625600c865c1980bb82da0f919e02b
Hall Liu [Thu, 6 Jul 2017 18:24:02 +0000 (18:24 +0000)]
Merge "Add a reason arg to streamStateUpdated"
am:
6ba3829074
Change-Id: I0c05734f18d58d7693d8777a4d1bb7950a5f54af
Android Build Merger (Role) [Thu, 6 Jul 2017 18:23:57 +0000 (18:23 +0000)]
Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27" into stage-aosp-master
Fyodor Kupolov [Thu, 6 Jul 2017 18:22:49 +0000 (18:22 +0000)]
Merge "Fix ContentObserver unregister issue"
am:
09b6988e27
Change-Id: Ia9573b2cb453d3ff493a691675bee0f5dfc44396
Fyodor Kupolov [Thu, 6 Jul 2017 18:21:54 +0000 (18:21 +0000)]
Merge "Fix ContentObserver unregister issue"
am:
09b6988e27
Change-Id: I242e87b53f603a05ba7c4069662456457a3d980a
Hall Liu [Thu, 6 Jul 2017 18:08:02 +0000 (18:08 +0000)]
Merge "Add a reason arg to streamStateUpdated"
Fyodor Kupolov [Thu, 6 Jul 2017 18:07:04 +0000 (18:07 +0000)]
Merge "Fix ContentObserver unregister issue"
Love Khanna [Fri, 12 May 2017 08:23:42 +0000 (13:53 +0530)]
AID suffix registration.
Test: compiles.
Change-Id: I0ab02599814722055d77eef29e734bfd45e8d1ee
Adam Vartanian [Thu, 6 Jul 2017 14:43:52 +0000 (15:43 +0100)]
Streamline testInstall_compatibleContext()
Conscrypt is making ClientSessionContext#getSession() private since
users shouldn't be calling it, which causes this test to fail to build.
While this test uses it, in practice the only non-Conscrypt code it's
testing is SSLSessionCache#install(), the rest of it just tests that
Conscrypt works properly. We reduce the test to just a test of the
SSLSessionCache code, since Conscrypt's tests should suffice for testing
Conscrypt's use of the cache.
Test: adb shell am instrument -w -e class android.net.SSLSessionCacheTest com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Iea61c47eb2c002629dd2f50c81d5bc4f7221c654
Android Build Merger (Role) [Thu, 6 Jul 2017 08:13:28 +0000 (08:13 +0000)]
Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19" into stage-aosp-master am:
311b2a31fa" into oc-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 08:13:00 +0000 (08:13 +0000)]
Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19" into stage-aosp-master am:
311b2a31fa" into oc-dev-plus-aosp
Erik Kline [Thu, 6 Jul 2017 08:11:55 +0000 (08:11 +0000)]
Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19" into stage-aosp-master
am:
311b2a31fa
Change-Id: If2fa9371bc286d2115167b8187f641ec9dfb89a9
Erik Kline [Thu, 6 Jul 2017 08:11:44 +0000 (08:11 +0000)]
Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19" into stage-aosp-master
am:
311b2a31fa
Change-Id: I462aa9d52205b1dff46b074e5a13945c34e96890
Android Build Merger (Role) [Thu, 6 Jul 2017 08:11:03 +0000 (08:11 +0000)]
Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19 am:
aa9d12fa56" into oc-dev-plus-aosp
Erik Kline [Thu, 6 Jul 2017 08:10:00 +0000 (08:10 +0000)]
Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19
am:
aa9d12fa56
Change-Id: Iae705d2522f1a21e7aa970a4c16efd41943031ab
Erik Kline [Thu, 6 Jul 2017 08:09:13 +0000 (08:09 +0000)]
Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19
am:
aa9d12fa56
Change-Id: I9097493cec6ac13dc027ee1d2f13bbe52679e674
Android Build Merger (Role) [Thu, 6 Jul 2017 08:04:24 +0000 (08:04 +0000)]
Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19" into stage-aosp-master
Erik Kline [Thu, 6 Jul 2017 08:03:19 +0000 (08:03 +0000)]
Merge "Clearly log tether_offload_disabled setting status in start()"
am:
b171a46d19
Change-Id: Ic74dcee4e473e4b6498b16affad88706bb4a6b7e
Erik Kline [Thu, 6 Jul 2017 08:02:44 +0000 (08:02 +0000)]
Merge "Clearly log tether_offload_disabled setting status in start()"
am:
b171a46d19
Change-Id: I999926bf0b67b12caadeea2d3766d8f69913bafe
Treehugger Robot [Thu, 6 Jul 2017 07:54:33 +0000 (07:54 +0000)]
Merge "Clearly log tether_offload_disabled setting status in start()"
Erik Kline [Thu, 6 Jul 2017 03:38:48 +0000 (12:38 +0900)]
Clearly log tether_offload_disabled setting status in start()
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
Bug:
29337859
Bug:
32163131
Change-Id: I113358ef71c2e5e3254eb6f9fbf9d5721825b0df
Merged-In: Iebcdb7bfaa85f822e73fe2f3b54caceb5420709c
Merged-In: Ifce832dca7b4d8b3056e2a9e91d38bffe25cfeb6
Merged-In: I99f6abc31579b4b25589452c44e1834a7ba4e591
Merged-In: I312a9309d6934bcec7fc0245cad12b97f1a22521
Android Build Merger (Role) [Thu, 6 Jul 2017 03:33:18 +0000 (03:33 +0000)]
Merge "Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446" into stage-aosp-master am:
e62a5fc7d3" into oc-dev-plus-aosp
Mathieu Chartier [Thu, 6 Jul 2017 03:31:51 +0000 (03:31 +0000)]
Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446" into stage-aosp-master
am:
e62a5fc7d3
Change-Id: I1c87dc82499ac1a53ba3a6c14d79586b4d7db986
OSDN Git Service
