OSDN Git Service
Evan Laird [Thu, 6 Jul 2017 20:39:33 +0000 (20:39 +0000)]
Merge "Fix RTL mobile signal drawing out of bounds in QS Edit" into oc-dr1-dev
am:
1b59a9ccb2
Change-Id: I9ec17abd8a4ae29f437a8611c0e8f3059d1b0e73
Karthik Ravi Shankar [Thu, 6 Jul 2017 20:38:18 +0000 (20:38 +0000)]
Merge "Fix the VR virtual display height" into oc-dr1-dev
am:
a79a23dba5
Change-Id: Ie83926b9cca629fb2d3e2ba2bbad9c1a13629db6
Android Build Merger (Role) [Thu, 6 Jul 2017 20:35:29 +0000 (20:35 +0000)]
Merge "Merge "Merge "Log errors on android.os.VintfObject.verify()" am:
54b1e9c57c am:
90a5fd0549" into oc-dev-plus-aosp am:
04df4c07fe" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 20:34:58 +0000 (20:34 +0000)]
Merge "Merge "Merge "Log errors on android.os.VintfObject.verify()" am:
54b1e9c57c am:
90a5fd0549" into oc-dev-plus-aosp am:
04df4c07fe" into oc-dr1-dev-plus-aosp
Yifan Hong [Thu, 6 Jul 2017 20:34:20 +0000 (20:34 +0000)]
Merge "Merge "Log errors on android.os.VintfObject.verify()" am:
54b1e9c57c am:
90a5fd0549" into oc-dev-plus-aosp
am:
04df4c07fe
Change-Id: I36613d1582663f229a8025cf7cfb2c9dad1f565f
Yifan Hong [Thu, 6 Jul 2017 20:33:57 +0000 (20:33 +0000)]
Merge "Merge "Log errors on android.os.VintfObject.verify()" am:
54b1e9c57c am:
90a5fd0549" into oc-dev-plus-aosp
am:
04df4c07fe
Change-Id: I2266994567f5533124566cb0ea41d792bb8e2e72
Android Build Merger (Role) [Thu, 6 Jul 2017 20:33:46 +0000 (20:33 +0000)]
Merge "Merge "Log errors on android.os.VintfObject.verify()" am:
54b1e9c57c am:
90a5fd0549 am:
429b739ff5" into oc-dr1-dev-plus-aosp
TreeHugger Robot [Thu, 6 Jul 2017 20:32:47 +0000 (20:32 +0000)]
Merge "Fix RTL mobile signal drawing out of bounds in QS Edit" into oc-dr1-dev
Yifan Hong [Thu, 6 Jul 2017 20:32:39 +0000 (20:32 +0000)]
Merge "Log errors on android.os.VintfObject.verify()" am:
54b1e9c57c am:
90a5fd0549
am:
429b739ff5
Change-Id: I446eba3137fc7077d7512d6e8b27a2f05a0bb281
TreeHugger Robot [Thu, 6 Jul 2017 20:31:36 +0000 (20:31 +0000)]
Merge "Fix the VR virtual display height" into oc-dr1-dev
Yifan Hong [Thu, 6 Jul 2017 20:31:21 +0000 (20:31 +0000)]
Merge "Log errors on android.os.VintfObject.verify()" am:
54b1e9c57c am:
90a5fd0549
am:
429b739ff5
Change-Id: I6acb5102e5052ce4182205a3ed16eee0006dbd49
Android Build Merger (Role) [Thu, 6 Jul 2017 20:29:32 +0000 (20:29 +0000)]
Merge "Merge "Disable test in presubmit" into oc-dr1-dev am:
21fe942d88" into oc-dr1-dev-plus-aosp
Jason Monk [Thu, 6 Jul 2017 20:28:42 +0000 (20:28 +0000)]
Merge "Disable test in presubmit" into oc-dr1-dev
am:
21fe942d88
Change-Id: I8cf1043c3206c6ae38bc24cf41e7cdfeb8c19d61
Android Build Merger (Role) [Thu, 6 Jul 2017 20:28:13 +0000 (20:28 +0000)]
Merge "Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am:
040b774928" into oc-dr1-dev am:
bc0afda3d2" into oc-dr1-dev-plus-aosp
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
Android Build Merger (Role) [Thu, 6 Jul 2017 20:27:47 +0000 (20:27 +0000)]
Merge "Merge "Disable test in presubmit" into oc-dr1-dev am:
21fe942d88" into oc-dr1-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
Andrew Solovay [Thu, 6 Jul 2017 20:26:55 +0000 (20:26 +0000)]
Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am:
040b774928" into oc-dr1-dev
am:
bc0afda3d2
Change-Id: Ic6f71215a5ba5288fbe397461d8df1b7bfda4960
Jason Monk [Thu, 6 Jul 2017 20:26:44 +0000 (20:26 +0000)]
Merge "Disable test in presubmit" into oc-dr1-dev
am:
21fe942d88
Change-Id: Ifb653ceac977ece3149dcad9c9dd510c5669961e
Android Build Merger (Role) [Thu, 6 Jul 2017 20:26:40 +0000 (20:26 +0000)]
Merge "Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am:
040b774928" into oc-dev-plus-aosp am:
9cd4a89735" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 20:26:25 +0000 (20:26 +0000)]
Merge "Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am:
040b774928" into oc-dr1-dev am:
10dedbbc8a" into oc-dr1-dev-plus-aosp
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
Android Build Merger (Role) [Thu, 6 Jul 2017 20:25:58 +0000 (20:25 +0000)]
Merge "Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am:
040b774928" into oc-dr1-dev am:
bc0afda3d2" into oc-dr1-dev-plus-aosp
Andrew Solovay [Thu, 6 Jul 2017 20:25:13 +0000 (20:25 +0000)]
Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am:
040b774928" into oc-dev-plus-aosp
am:
9cd4a89735
Change-Id: I36febf08e7b5d4738372594ab5ed87153c3639a4
Andrew Solovay [Thu, 6 Jul 2017 20:24:56 +0000 (20:24 +0000)]
Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am:
040b774928" into oc-dr1-dev
am:
bc0afda3d2
Change-Id: I143c8039c2d9119d78583399c51c3f227e1d0410
Andrew Solovay [Thu, 6 Jul 2017 20:24:42 +0000 (20:24 +0000)]
Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am:
040b774928" into oc-dr1-dev
am:
10dedbbc8a
Change-Id: I550cb90f17291d1bb97117a81f9fe31bf9aea965
Android Build Merger (Role) [Thu, 6 Jul 2017 20:24:25 +0000 (20:24 +0000)]
Merge "Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am:
040b774928" into oc-dr1-dev am:
10dedbbc8a" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 20:24:05 +0000 (20:24 +0000)]
Merge "Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am:
040b774928" into oc-dev-plus-aosp am:
9cd4a89735" into oc-dr1-dev-plus-aosp
Andrew Solovay [Thu, 6 Jul 2017 20:23:20 +0000 (20:23 +0000)]
Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am:
040b774928" into oc-dr1-dev
am:
10dedbbc8a
Change-Id: I06563e2f53db8661c3bae013dc3a42a5d4ab07e1
Andrew Solovay [Thu, 6 Jul 2017 20:23:11 +0000 (20:23 +0000)]
Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am:
040b774928" into oc-dev-plus-aosp
am:
9cd4a89735
Change-Id: I7e3d9f558080a46f6c7ab2d26c64ae693011a73e
Android Build Merger (Role) [Thu, 6 Jul 2017 20:22:57 +0000 (20:22 +0000)]
Merge "Merge "AOD: Fix flicker when unlocking with fingerprint" into oc-dr1-dev am:
88265d29bd" into oc-dr1-dev-plus-aosp
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
Adrian Roos [Thu, 6 Jul 2017 20:21:44 +0000 (20:21 +0000)]
Merge "AOD: Fix flicker when unlocking with fingerprint" into oc-dr1-dev
am:
88265d29bd
Change-Id: Ic731a28f8fae87758dd5774dcf71c2ebd2f5c3d9
Andrew Solovay [Thu, 6 Jul 2017 20:21:44 +0000 (20:21 +0000)]
Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am:
040b774928
am:
ee10807328
Change-Id: I6ba7c1255c103075fce541db27226996366968a3
Yifan Hong [Thu, 6 Jul 2017 19:48:26 +0000 (19:48 +0000)]
Merge "Log errors on android.os.VintfObject.verify()"
TreeHugger Robot [Thu, 6 Jul 2017 19:19:06 +0000 (19:19 +0000)]
Merge "Disable test in presubmit" into oc-dr1-dev
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
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-dr1-dev
Android Build Merger (Role) [Thu, 6 Jul 2017 18:59:44 +0000 (18:59 +0000)]
Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am:
040b774928" into oc-dr1-dev
Andrew Solovay [Thu, 6 Jul 2017 18:59:39 +0000 (18:59 +0000)]
Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev
am:
040b774928
Change-Id: I0a05fdcd1d440f1ea686ddd0e6afd82daf33d1bb
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
TreeHugger Robot [Thu, 6 Jul 2017 18:58:37 +0000 (18:58 +0000)]
Merge "AOD: Fix flicker when unlocking with fingerprint" into oc-dr1-dev
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:58:17 +0000 (18:58 +0000)]
Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev
am:
040b774928
Change-Id: Ief0f1ce03e137ae4a16067cf7430cf7bc333a96d
Android Build Merger (Role) [Thu, 6 Jul 2017 18:56:59 +0000 (18:56 +0000)]
Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master am:
7e97085ee7" into oc-dev-plus-aosp am:
60ec77baf9" into oc-dr1-dev-plus-aosp
Hall Liu [Thu, 6 Jul 2017 18:55:08 +0000 (18:55 +0000)]
Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master am:
7e97085ee7" into oc-dev-plus-aosp
am:
60ec77baf9
Change-Id: Id578e3661709d57cee33484671e66dbe8b23f687
Android Build Merger (Role) [Thu, 6 Jul 2017 18:54:17 +0000 (18:54 +0000)]
Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master am:
4c3be35123" into oc-dev-plus-aosp am:
b91a596c9b" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 18:53:36 +0000 (18:53 +0000)]
Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master am:
7e97085ee7" into oc-dev-plus-aosp am:
60ec77baf9" into oc-dr1-dev-plus-aosp
Hall Liu [Thu, 6 Jul 2017 18:53:16 +0000 (18:53 +0000)]
Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master am:
4c3be35123" into oc-dev-plus-aosp
am:
b91a596c9b
Change-Id: I6771283cdf4e8bd9f7644a325a31a6ea6fe76001
Hall Liu [Thu, 6 Jul 2017 18:52:04 +0000 (18:52 +0000)]
Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master am:
7e97085ee7" into oc-dev-plus-aosp
am:
60ec77baf9
Change-Id: I7b838c599027ae365b92fd2fe06f2ef3e9599117
Android Build Merger (Role) [Thu, 6 Jul 2017 18:51:30 +0000 (18:51 +0000)]
Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master am:
4c3be35123" into oc-dev-plus-aosp am:
b91a596c9b" into oc-dr1-dev-plus-aosp
Hall Liu [Thu, 6 Jul 2017 18:49:59 +0000 (18:49 +0000)]
Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master am:
4c3be35123" into oc-dev-plus-aosp
am:
b91a596c9b
Change-Id: I7b21ffc84d7c53ae68ae3ca61b3bcca107df141d
Android Build Merger (Role) [Thu, 6 Jul 2017 18:49:29 +0000 (18:49 +0000)]
Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master am:
4c3be35123" into oc-dev-plus-aosp am:
af3c9615f1" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 18:48:03 +0000 (18:48 +0000)]
Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev am:
f259a1975b" into oc-dr1-dev-plus-aosp
Hall Liu [Thu, 6 Jul 2017 18:47:57 +0000 (18:47 +0000)]
Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master am:
4c3be35123" into oc-dev-plus-aosp
am:
af3c9615f1
Change-Id: If16e4a6da97e2ee70f2a2ca8444fa24fa9210bf1
Hiroki Yamamoto [Thu, 6 Jul 2017 18:47:09 +0000 (18:47 +0000)]
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev
am:
f259a1975b
Change-Id: Ie16f4282d3881bc7f306d55aacc7c9f0585a1be0
Hiroki Yamamoto [Thu, 6 Jul 2017 18:46:41 +0000 (18:46 +0000)]
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev
am:
f259a1975b
Change-Id: I89bc4bb9469a1bd316eabe22abaf7ee2c10fc02c
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
Fyodor Kupolov [Thu, 6 Jul 2017 18:41:48 +0000 (18:41 +0000)]
Merge "Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27" into stage-aosp-master am:
785ab04d7a" into oc-dev-plus-aosp
am:
d6bb9401eb
Change-Id: Ie879dcf1b443563f5e3e55e15eb0dca8670d325d
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
Fyodor Kupolov [Thu, 6 Jul 2017 18:40:20 +0000 (18:40 +0000)]
Merge "Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27" into stage-aosp-master am:
785ab04d7a" into oc-dev-plus-aosp
am:
f035f800b7
Change-Id: I4cd47fea5a6e32d166295374ce3e5a898fe57110
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
Fyodor Kupolov [Thu, 6 Jul 2017 18:38:57 +0000 (18:38 +0000)]
Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27 am:
481d92c517" into oc-dev-plus-aosp
am:
6c6b3820f7
Change-Id: Ic03a469684e57e6c703d55cef69bedd6eabd1664
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
Fyodor Kupolov [Thu, 6 Jul 2017 18:37:34 +0000 (18:37 +0000)]
Merge "Fix ContentObserver unregister issue" am:
09b6988e27 am:
481d92c517
am:
aee5787b48
Change-Id: I6cbd47b7158d5ccd207c0ce57ca613ebc7822b5f
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
TreeHugger Robot [Thu, 6 Jul 2017 18:35:25 +0000 (18:35 +0000)]
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev
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
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
Karthik Ravi Shankar [Thu, 6 Jul 2017 17:23:57 +0000 (10:23 -0700)]
Fix the VR virtual display height
The display of the VR virtual display was set incorrectly in ag/
2460110.
This was a part of debugging code mistakenly left behind, but it is
causing CTS tests to fail and also changes the resolution of virtual
display on standalone devices.
Bug:
62842592
Bug:
63339799
Test: run cts -m CtsServicesHostTestCases -t
android.server.cts.ActivityManagerDisplayTests#testVrActivityLaunch
passes with the change and restores original resolution on standalone
devices.
Change-Id: I6e77f9b3b09f02e411bab12bb69d8141312e5b64
Signed-off-by: Karthik Ravi Shankar <karthikrs@google.com>
Android Build Merger (Role) [Thu, 6 Jul 2017 18:08:32 +0000 (18:08 +0000)]
Merge "Merge "Password field colors" into oc-dr1-dev am:
e21a151fe7" into oc-dr1-dev-plus-aosp
Hall Liu [Thu, 6 Jul 2017 18:08:02 +0000 (18:08 +0000)]
Merge "Add a reason arg to streamStateUpdated"
Lucas Dupin [Thu, 6 Jul 2017 18:07:42 +0000 (18:07 +0000)]
Merge "Password field colors" into oc-dr1-dev
am:
e21a151fe7
Change-Id: I1b0ba8bb0cfcc5a5b7002242f134873682decf7b
Lucas Dupin [Thu, 6 Jul 2017 18:07:09 +0000 (18:07 +0000)]
Merge "Password field colors" into oc-dr1-dev
am:
e21a151fe7
Change-Id: I71a11428363e20474f7bed44da68bd01e39fb3de
Fyodor Kupolov [Thu, 6 Jul 2017 18:07:04 +0000 (18:07 +0000)]
Merge "Fix ContentObserver unregister issue"
Android Build Merger (Role) [Thu, 6 Jul 2017 18:04:09 +0000 (18:04 +0000)]
Merge "Merge "AOD: Skip window animations while dozing" into oc-dr1-dev am:
92b6b7090c" into oc-dr1-dev-plus-aosp
Adrian Roos [Thu, 6 Jul 2017 18:03:11 +0000 (18:03 +0000)]
Merge "AOD: Skip window animations while dozing" into oc-dr1-dev
am:
92b6b7090c
Change-Id: If0fc6ed0c95587114df1e7f8950fb0df99812ae2
TreeHugger Robot [Thu, 6 Jul 2017 18:02:47 +0000 (18:02 +0000)]
Merge "Password field colors" into oc-dr1-dev
Adrian Roos [Thu, 6 Jul 2017 18:02:30 +0000 (18:02 +0000)]
Merge "AOD: Skip window animations while dozing" into oc-dr1-dev
am:
92b6b7090c
Change-Id: I834761678ad26b66ac3e3b93a1398d9fce5e0f6c
TreeHugger Robot [Thu, 6 Jul 2017 17:53:24 +0000 (17:53 +0000)]
Merge "AOD: Skip window animations while dozing" into oc-dr1-dev
Android Build Merger (Role) [Thu, 6 Jul 2017 17:18:55 +0000 (17:18 +0000)]
Merge "Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev am:
25937550af" into oc-dr1-dev-plus-aosp
Daniel Nishi [Thu, 6 Jul 2017 17:17:11 +0000 (17:17 +0000)]
Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev
am:
25937550af
Change-Id: If4b01fcf9e984546f9242446dcb3d02efe4725af
Daniel Nishi [Thu, 6 Jul 2017 17:15:24 +0000 (17:15 +0000)]
Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev
am:
25937550af
Change-Id: I53435cc58c29fd72cecca91e730cbfd745c35ef6
Android Build Merger (Role) [Thu, 6 Jul 2017 17:12:04 +0000 (17:12 +0000)]
Merge "Merge "Broadcast only if boot complete" into oc-dr1-dev am:
b60c48a6a2" into oc-dr1-dev-plus-aosp
Jerry Zhang [Thu, 6 Jul 2017 17:10:55 +0000 (17:10 +0000)]
Merge "Broadcast only if boot complete" into oc-dr1-dev
am:
b60c48a6a2
Change-Id: I53d2958b56ee6b48457741268e8578dc3316091c
Jerry Zhang [Thu, 6 Jul 2017 17:10:40 +0000 (17:10 +0000)]
Merge "Broadcast only if boot complete" into oc-dr1-dev
am:
b60c48a6a2
Change-Id: I99f2ec3d45fa69be68aa52aa769929645f8432cf
OSDN Git Service
