OSDN Git Service
Steven Thomas [Thu, 11 May 2017 18:05:20 +0000 (18:05 +0000)]
Merge "Add vr platform lib" into oc-dev
am:
a22a5d83c2
Change-Id: Ie974942e449396dfb091c37f40bd35259481738f
Phil Weaver [Thu, 11 May 2017 17:59:07 +0000 (17:59 +0000)]
Merge "Removed obsolete a11y support for ClickableSpan" into oc-dev
am:
f970743e15
Change-Id: I75df9d3ab5abd23fa7585575786bcc0b88101bf5
Steven Thomas [Thu, 11 May 2017 17:16:45 +0000 (17:16 +0000)]
Merge "Add vr platform lib" into oc-dev
Phil Weaver [Thu, 11 May 2017 17:12:40 +0000 (17:12 +0000)]
Merge "Removed obsolete a11y support for ClickableSpan" into oc-dev
Michael Wright [Thu, 11 May 2017 16:04:53 +0000 (16:04 +0000)]
Merge "Avoid NPE when getting last shutdown reason." into oc-dev
am:
0cf6b908a8
Change-Id: Ib31807bddc953d2bba068359c9468257d1b92a9f
TreeHugger Robot [Thu, 11 May 2017 15:54:12 +0000 (15:54 +0000)]
Merge "Avoid NPE when getting last shutdown reason." into oc-dev
Albert Chaulk [Thu, 11 May 2017 15:43:47 +0000 (15:43 +0000)]
Merge "Propagate UIDs for all SurfaceControl instances" into oc-dev
am:
6c34dd58f6
Change-Id: Ia3aa4d9537f141a3132afefbcdac5b0bda61722b
Albert Chaulk [Thu, 11 May 2017 15:19:21 +0000 (15:19 +0000)]
Merge "Propagate UIDs for all SurfaceControl instances" into oc-dev
Android Build Merger (Role) [Thu, 11 May 2017 14:34:40 +0000 (14:34 +0000)]
Merge "Add an O-release targetAPI check for Canvas.setBitmap. am:
d70695ee34" into oc-dev-plus-aosp
Android Build Merger (Role) [Thu, 11 May 2017 14:33:01 +0000 (14:33 +0000)]
Merge "Merge changes Ie762ce75,I611fd791 am:
21a57f263f am:
cc9f695ba0 am:
164854bde2" into oc-dev-plus-aosp
Derek Sollenberger [Thu, 11 May 2017 14:32:07 +0000 (14:32 +0000)]
Add an O-release targetAPI check for Canvas.setBitmap.
am:
d70695ee34
Change-Id: Ic486fce9a8471c298ba2cd2413eeb9d1b218ac71
Hugo Benichi [Thu, 11 May 2017 14:28:23 +0000 (14:28 +0000)]
Merge changes Ie762ce75,I611fd791 am:
21a57f263f am:
cc9f695ba0
am:
164854bde2
Change-Id: I1495249f1ced84438dbd5dd0ad6678e2ee4062cb
Jason Monk [Thu, 11 May 2017 14:27:53 +0000 (14:27 +0000)]
Merge "Don't show wifi in status bar in QS DO NOT MERGE" into oc-dev
am:
6d4db456ea
Change-Id: Ied35cc5e37da58f3631a733566efbfd381b495b5
Hugo Benichi [Thu, 11 May 2017 13:56:22 +0000 (13:56 +0000)]
Merge changes Ie762ce75,I611fd791 am:
21a57f263f
am:
cc9f695ba0
Change-Id: I39dbc3c3c7e69e87e12977fb173379e60c74a3d9
Julia Reynolds [Thu, 11 May 2017 13:43:38 +0000 (13:43 +0000)]
Merge "Fix notification_alert logging" into oc-dev
am:
d82a04664c
Change-Id: I55ea25357f54d335ba4e5e0926cd10062eff06cd
Derek Sollenberger [Fri, 5 May 2017 19:44:04 +0000 (15:44 -0400)]
Add an O-release targetAPI check for Canvas.setBitmap.
For apps targeting releases earlier than O setBitmap will attempt
to preserve the matrix from the previous bitmap. It does not however
attempt to reconstruct the save/restore stack or the clip.
Test: manual test of messenger app referenced in the bug
Bug:
37589964
Change-Id: I67f0928a3f84a8be41da38ef1868e79bdeb03e46
Jason Monk [Thu, 11 May 2017 13:21:32 +0000 (13:21 +0000)]
Merge "Don't show wifi in status bar in QS DO NOT MERGE" into oc-dev
Julia Reynolds [Thu, 11 May 2017 13:03:42 +0000 (13:03 +0000)]
Merge "Fix notification_alert logging" into oc-dev
Hugo Benichi [Thu, 11 May 2017 12:43:42 +0000 (12:43 +0000)]
Merge changes Ie762ce75,I611fd791
am:
21a57f263f
Change-Id: Ibb291720f6c257a8ead2c039f584f4b3ecc69be5
Hugo Benichi [Thu, 11 May 2017 12:31:39 +0000 (12:31 +0000)]
Merge changes Ie762ce75,I611fd791
* changes:
ConnectivityManager: unit test for argument validation
ConnectivityManager: uses service error codes and exceptions
Nicolas Geoffray [Thu, 11 May 2017 12:22:57 +0000 (12:22 +0000)]
Remove obsolete DEXOPT_SAFEMODE.
am:
972b2c236e
Change-Id: Idbcca56b3850d3891a352b98942724637db00f36
Paul Duffin [Thu, 11 May 2017 11:31:28 +0000 (11:31 +0000)]
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" into oc-dev-plus-aosp
Nicolas Geoffray [Thu, 11 May 2017 10:24:13 +0000 (10:24 +0000)]
Merge "Remove obsolete DEXOPT_SAFEMODE." am:
383b2af3ec am:
10085b3737
am:
4e3f529c6d
Change-Id: If98007a52a931cbd2d2800e94e02a1b4ecd32f08
Nicolas Geoffray [Thu, 11 May 2017 10:10:20 +0000 (10:10 +0000)]
Merge "Remove obsolete DEXOPT_SAFEMODE." am:
383b2af3ec
am:
10085b3737
Change-Id: Id05d1cd2d9cb6bd1b9d80b2128b45c4a411951a3
Nicolas Geoffray [Thu, 11 May 2017 09:59:49 +0000 (09:59 +0000)]
Merge "Remove obsolete DEXOPT_SAFEMODE."
am:
383b2af3ec
Change-Id: I97ccd9f087366d93495e3aeb8b26780039fd417b
Nicolas Geoffray [Thu, 11 May 2017 09:50:19 +0000 (09:50 +0000)]
Merge "Handle safe mode in PackageManager." into oc-dev
am:
a6a73ff55a
Change-Id: Id85cdfb3d59c25a0df015fc813a2f859b2c23309
Nicolas Geoffray [Fri, 5 May 2017 13:30:02 +0000 (14:30 +0100)]
Remove obsolete DEXOPT_SAFEMODE.
PackageManager side of the change.
bug:
37929796
Test: build
Change-Id: Iae830bb4060b448b4b4e54d3e0fe03ebee39d3fa
(cherry picked from commit
56123bacff220e6ac77a1179197578d3a62ecdd2)
Nicolas Geoffray [Thu, 11 May 2017 09:43:44 +0000 (09:43 +0000)]
Merge "Handle safe mode in PackageManager." into oc-dev
Nicolas Geoffray [Thu, 11 May 2017 09:42:23 +0000 (09:42 +0000)]
Merge "Remove obsolete DEXOPT_SAFEMODE."
Bill Yi [Thu, 11 May 2017 08:45:22 +0000 (08:45 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
0996c7a70b -s ours
Change-Id: Id8510d877f82da38a8b71aeb0e0cef1020e242bf
Santos Cordon [Thu, 11 May 2017 08:38:52 +0000 (08:38 +0000)]
Merge "Remove system properties that gates virtual displays in VR." into oc-dev
am:
c3440d30c1
Change-Id: I93ced3d905ff46a8bb5384f497f3cc004ce3b0ac
Bill Yi [Thu, 11 May 2017 08:34:07 +0000 (08:34 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
d5e72b250f -s ours
Change-Id: I42d9260014f7319d8de5b3ac8ef45f05b5694e68
TreeHugger Robot [Thu, 11 May 2017 08:15:10 +0000 (08:15 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Thu, 11 May 2017 08:07:40 +0000 (08:07 +0000)]
Merge "Remove system properties that gates virtual displays in VR." into oc-dev
TreeHugger Robot [Thu, 11 May 2017 08:01:49 +0000 (08:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Jaewan Kim [Thu, 11 May 2017 07:42:50 +0000 (07:42 +0000)]
Merge "Don't ignore remote media sessions when sending media key events" into oc-dev
am:
60b48570e2
Change-Id: Ic39253af5902dfba18e3ebd748f844b20cacd1ff
Jaewan Kim [Thu, 11 May 2017 07:15:00 +0000 (07:15 +0000)]
Merge "Don't ignore remote media sessions when sending media key events" into oc-dev
Bill Yi [Thu, 11 May 2017 06:46:28 +0000 (06:46 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
899ca73297 -s ours
Change-Id: Id1acf037028ea2db8fdd42ab69c51665ed4295b6
Santos Cordon [Thu, 11 May 2017 06:39:54 +0000 (06:39 +0000)]
Merge "Add uniqueId to Virtual Display and pass through to inputflinger (1/2)" into oc-dev
am:
424e328bba -s ours
Change-Id: I87c4f3e5dfd0d798cf730f5f8f379b26c8625e8d
TreeHugger Robot [Thu, 11 May 2017 06:02:40 +0000 (06:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Thu, 11 May 2017 05:59:58 +0000 (22:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: If1143ee1e19bd5c141d5d776cd86e936ced2a1a2
Auto-generated-cl: translation import
Santos Cordon [Tue, 9 May 2017 18:36:53 +0000 (11:36 -0700)]
Remove system properties that gates virtual displays in VR.
Bug:
38165337
Test: Manual - Run VR and ensure that secondary display is
listed in 'adb shell dumpsys displays'.
Change-Id: Icf19b7da87bbc89a68f1d77e42c02a93674f7990
Philip P. Moltmann [Thu, 11 May 2017 05:26:10 +0000 (05:26 +0000)]
Merge "Speed up structure update before OnFillRequest" into oc-dev
am:
6ab00addb1
Change-Id: Ia109ee243482ca0ac5622ec415ca5bfffba7d8e3
Fyodor Kupolov [Thu, 11 May 2017 05:22:19 +0000 (05:22 +0000)]
Merge "Added isUserNameSet" into oc-dev
am:
a9154ab391
Change-Id: I013381eab8809b98d17e7cf9063a62e4884b0e2a
Hugo Benichi [Tue, 9 May 2017 05:09:02 +0000 (14:09 +0900)]
ConnectivityManager: unit test for argument validation
Bug:
36701874,
37107940
Test: new test passes
Change-Id: Ie762ce758b3d94052b7438a67fc55bef4690cbbb
Hugo Benichi [Thu, 11 May 2017 04:16:17 +0000 (13:16 +0900)]
ConnectivityManager: uses service error codes and exceptions
This patch introduces between ConnectivityManager and
ConnectivityService a mechanism for propagating back to clients
informative errors in the form of error codes and associated custom
runtime exceptions.
Without error code, the service can only throw a limited number of
different exceptions over Binder. Furthermore the throw site stack
traces are always loss. Although for individual instances of a throw,
the error message can be inspected, aggregations of stack traces from
app crashes sanitize error messages and only leaves the stack traces.
This makes debugging dificult for some service calls such as
requestNetwork that can have a variety of failure modes.
In this patch only one failure mode is codified. More can be added later
at a light cost by: 1) defining an error code, 2) defining an
associated exception, 3) mapping the code to the exception. This patch
can serves as a template for doing so.
Test: $ runtest frameworks-net,
#testNetworkRequestMaximum() detects the new exception type.
Bug:
36556809,
36701874
Change-Id: I611fd7915575c9e418f7149fcdc8a879d2a3716d
Phil Weaver [Thu, 11 May 2017 05:06:17 +0000 (05:06 +0000)]
Merge "Remove outdated security note from A11yEvent" into oc-dev
am:
ea60efa8ef
Change-Id: I8cf9a60c6fe0911fa485b902bf6f4eb3968baef1
Fyodor Kupolov [Thu, 11 May 2017 04:50:50 +0000 (04:50 +0000)]
Merge "Use buffered DataInputStream vs RandomAccessFile" into oc-dev
am:
b4a032fd02
Change-Id: I1ef1890ae7965da56c1799495aa49727b1d844a6
Bill Yi [Thu, 11 May 2017 04:38:49 +0000 (21:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I45ac4cb992313e5eecd6c1af90b8c4181738e4c7
Auto-generated-cl: translation import
Jean-Michel Trivi [Thu, 11 May 2017 04:33:44 +0000 (04:33 +0000)]
Merge "Audio focus: fix focus loss notification for older SDKs" into oc-dev
am:
8d4f9d8e0a
Change-Id: I27278a02f88ebaca466bf5b105d2032ab2541798
Sundeep Ghuman [Thu, 11 May 2017 04:02:16 +0000 (04:02 +0000)]
Merge "Change Wifi Picker icons to colorControlNormal." into oc-dev
am:
8680e8fc78
Change-Id: I6d315a98637b188615c81d558fd8d910d3fb6762
Phil Weaver [Thu, 11 May 2017 03:57:37 +0000 (03:57 +0000)]
Merge "Hiding text from obscured text fields." into oc-dev
am:
bcc6cc84bf
Change-Id: I06ac2af600c9703d5af9b583b63ff79ab01d6c68
TreeHugger Robot [Thu, 11 May 2017 03:55:34 +0000 (03:55 +0000)]
Merge "Add uniqueId to Virtual Display and pass through to inputflinger (1/2)" into oc-dev
Selim Cinek [Thu, 11 May 2017 03:53:27 +0000 (03:53 +0000)]
Merge "Fixed that the shelf was animating the icons" into oc-dev
am:
214f4cff15
Change-Id: I76dbc867f2d3222e77f6f5e2996021cce774bd52
Bill Yi [Thu, 11 May 2017 03:29:50 +0000 (20:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia752d5c70fe95b9228ec77d69a8c9b5dd1a0e71f
Auto-generated-cl: translation import
Roozbeh Pournader [Thu, 11 May 2017 03:25:21 +0000 (03:25 +0000)]
Merge "Move Phags-pa and Yi fonts to the end of fallback chain" into oc-dev
am:
7ffdc86b95
Change-Id: I64ee96aafdbe5beec9c5701590bc348df8fa0c92
TreeHugger Robot [Thu, 11 May 2017 03:22:17 +0000 (03:22 +0000)]
Merge "Speed up structure update before OnFillRequest" into oc-dev
TreeHugger Robot [Thu, 11 May 2017 03:19:49 +0000 (03:19 +0000)]
Merge "Added isUserNameSet" into oc-dev
Makoto Onuki [Thu, 11 May 2017 03:19:52 +0000 (03:19 +0000)]
Merge "Add a check to investigate b/
37893215." into oc-dev
am:
bf3423a939
Change-Id: I74a50f0373b0a841024add669310e8221549be67
Phil Weaver [Thu, 11 May 2017 02:59:27 +0000 (02:59 +0000)]
Merge "Clarify documentation for notification a11y events" into oc-dev
am:
69a0f3f020
Change-Id: Icad2076a2d7a6fdcd27c686c144cb233a17eea91
Adam Powell [Thu, 11 May 2017 02:52:20 +0000 (02:52 +0000)]
Merge "Lock out ResolverDrawerLayout dismissals during animations" into oc-dev
am:
33a030fa03
Change-Id: Ica063156bc487bd10d2c8af1a7520b71c1c31a88
Svet Ganov [Thu, 11 May 2017 02:48:46 +0000 (02:48 +0000)]
Merge "Properly position dataset picker UI" into oc-dev
am:
d915aecfaa
Change-Id: Ic480311a515e5a096f6b62319d677a07dd22c391
Adrian Roos [Thu, 11 May 2017 02:45:38 +0000 (02:45 +0000)]
Merge "AOD: Update wakeup animation" into oc-dev
am:
40b34460ef
Change-Id: Ibcecb29cfb4ba1f958d307bf96bfa28f9c2ee1b4
TreeHugger Robot [Thu, 11 May 2017 02:27:16 +0000 (02:27 +0000)]
Merge "Remove outdated security note from A11yEvent" into oc-dev
TreeHugger Robot [Thu, 11 May 2017 02:24:44 +0000 (02:24 +0000)]
Merge "Use buffered DataInputStream vs RandomAccessFile" into oc-dev
Jean-Michel Trivi [Thu, 11 May 2017 02:19:52 +0000 (02:19 +0000)]
Merge "Audio focus: fix focus loss notification for older SDKs" into oc-dev
TreeHugger Robot [Thu, 11 May 2017 02:19:00 +0000 (02:19 +0000)]
Merge "Change Wifi Picker icons to colorControlNormal." into oc-dev
TreeHugger Robot [Thu, 11 May 2017 02:15:12 +0000 (02:15 +0000)]
Merge "Hiding text from obscured text fields." into oc-dev
TreeHugger Robot [Thu, 11 May 2017 02:14:52 +0000 (02:14 +0000)]
Merge "Fixed that the shelf was animating the icons" into oc-dev
TreeHugger Robot [Thu, 11 May 2017 02:08:42 +0000 (02:08 +0000)]
Merge "Move Phags-pa and Yi fonts to the end of fallback chain" into oc-dev
Michael Wachenschwanz [Thu, 11 May 2017 02:01:55 +0000 (02:01 +0000)]
Merge "WTF Logging for catching memory issue in Parcel" into oc-dev
am:
9254322192
Change-Id: I2471901f1504c242b9020f575126c56375036498
TreeHugger Robot [Thu, 11 May 2017 01:59:25 +0000 (01:59 +0000)]
Merge "Add a check to investigate b/
37893215." into oc-dev
TreeHugger Robot [Thu, 11 May 2017 01:57:04 +0000 (01:57 +0000)]
Merge "Clarify documentation for notification a11y events" into oc-dev
Santos Cordon [Wed, 5 Apr 2017 17:31:15 +0000 (10:31 -0700)]
Add uniqueId to Virtual Display and pass through to inputflinger (1/2)
This CL adds:
1) Adds uniqueId (protected via system/sig permission) to virtual
displays.
2) Add support for N virtual display viewports into inputflinger.
3) Set the virtual display's viewports in inputflinger if it has the
uniqueId value set to non-null. (a) Moving the new viewport from java to
native inputflinger and (b) adding "uniqueId" value to viewports makes
up the great majority of this change.
4) From the inputflinger side, we also read in a new value from the
input device configuration files called 'touch.displayId'.
5) When touch.displayId and the virtual display's uniqueId match,
inputflinger links the two.
Test: Start VR and ensure that the virtual viewport shows up when running
'adb shell dump input". Run a VR app, and ensure that the virtual input
device is associated with the new virtual viewport.
Test: com.android.server.display.DisplayManagerServiceTest
Bug:
36051620
Change-Id: Ic2117eb8e19f7f3c59687160591f8bc6692c1f12
Merged-In: Ic2117eb8e19f7f3c59687160591f8bc6692c1f12
TreeHugger Robot [Thu, 11 May 2017 01:48:46 +0000 (01:48 +0000)]
Merge "Lock out ResolverDrawerLayout dismissals during animations" into oc-dev
Mady Mellor [Thu, 11 May 2017 01:44:51 +0000 (01:44 +0000)]
Merge "Remove PIP tuner items" into oc-dev
am:
86339dc8ee
Change-Id: I8d584f830e706f20d181a0f46bf94783f30340e8
TreeHugger Robot [Thu, 11 May 2017 01:38:11 +0000 (01:38 +0000)]
Merge "Properly position dataset picker UI" into oc-dev
TreeHugger Robot [Thu, 11 May 2017 01:33:21 +0000 (01:33 +0000)]
Merge "AOD: Update wakeup animation" into oc-dev
Andre Eisenbach [Thu, 11 May 2017 01:33:18 +0000 (01:33 +0000)]
Merge "Bluetooth: HID: Add support for Set Idle and Get Idle Commands (3/4)" am:
51876abe82 am:
9413fd9e1f
am:
01d1188a8b
Change-Id: Ie92cbd1f5795d7b9f55d0e51503e7d08b61e8732
Michael Wachenschwanz [Thu, 11 May 2017 01:26:05 +0000 (01:26 +0000)]
Merge "WTF Logging for catching memory issue in Parcel" into oc-dev
TreeHugger Robot [Thu, 11 May 2017 01:13:44 +0000 (01:13 +0000)]
Merge "Remove PIP tuner items" into oc-dev
Kevin Chyn [Thu, 11 May 2017 01:13:10 +0000 (01:13 +0000)]
Merge "AuthenticationCallback should not be cleared onAuthenticationFailed" into oc-dev
am:
6fddc2472e
Change-Id: I3493866a4e594a186f897b02dca0773e4a7a0d49
Andre Eisenbach [Thu, 11 May 2017 01:10:49 +0000 (01:10 +0000)]
Merge "Bluetooth: HID: Add support for Set Idle and Get Idle Commands (3/4)" am:
51876abe82
am:
9413fd9e1f
Change-Id: If065f6d25da71238b3788af0ee0854321a905e47
Mady Mellor [Thu, 11 May 2017 01:07:46 +0000 (01:07 +0000)]
Merge "Slight adjustments to gradient shown when dragging to dismiss" into oc-dev
am:
1eeeba6af6
Change-Id: Icbd24ad48859a8a7d3f0a217a8f1d1bc879f8f2f
TreeHugger Robot [Thu, 11 May 2017 00:46:31 +0000 (00:46 +0000)]
Merge "AuthenticationCallback should not be cleared onAuthenticationFailed" into oc-dev
Andre Eisenbach [Thu, 11 May 2017 00:43:49 +0000 (00:43 +0000)]
Merge "Bluetooth: HID: Add support for Set Idle and Get Idle Commands (3/4)"
am:
51876abe82
Change-Id: Ia3242c0c2d7111b356c3ad2c70e8b1bea4572e9a
Felipe Leme [Thu, 11 May 2017 00:41:10 +0000 (00:41 +0000)]
Merge "Fixed autofill dumpsys and improved logging." into oc-dev
am:
08d8e034f4
Change-Id: I303ec6c9d1bef5d88b33c35e62c598ad6082c6ad
TreeHugger Robot [Thu, 11 May 2017 00:39:06 +0000 (00:39 +0000)]
Merge "Slight adjustments to gradient shown when dragging to dismiss" into oc-dev
Andre Eisenbach [Thu, 11 May 2017 00:37:42 +0000 (00:37 +0000)]
Merge "Bluetooth: HID: Add support for Set Idle and Get Idle Commands (3/4)"
Adrian Roos [Thu, 11 May 2017 00:30:58 +0000 (00:30 +0000)]
Merge "AOD: Anchor clock at a third of the height" into oc-dev
am:
2af0676b2d
Change-Id: I4eefd2a95a82c573f54fe3e71919e8553c42d206
Philip P. Moltmann [Tue, 9 May 2017 19:56:50 +0000 (12:56 -0700)]
Speed up structure update before OnFillRequest
We now
- cache AutofillId -> ViewNode
- look for all AutofillIds at the same time (instead of one by one)
Bug:
37997043
Test: CtsAutoFillServiceTestCases
Change-Id: I094468ad885eed0cc506b4b62ff09c4af48570ff
Android Build Merger (Role) [Thu, 11 May 2017 00:26:50 +0000 (00:26 +0000)]
Merge "Merge "Fixed a concurrent modification crash" into oc-dev am:
33bd2c6333" into oc-dev-plus-aosp
Selim Cinek [Thu, 11 May 2017 00:25:15 +0000 (00:25 +0000)]
Merge "Fixed a concurrent modification crash" into oc-dev
am:
33bd2c6333
Change-Id: Ic707ae6d212bc0d686c778f53d7decb5a84f0b00
Android Build Merger (Role) [Thu, 11 May 2017 00:24:47 +0000 (00:24 +0000)]
Merge "Merge "Adding a new config and Setting for WiFi Wakeup." into oc-dev am:
b569eedf37" into oc-dev-plus-aosp
Android Build Merger (Role) [Thu, 11 May 2017 00:20:19 +0000 (00:20 +0000)]
Merge "Merge "Merge "Notify ImsService Status Correctly" am:
1bb9181380 am:
6d249dc08c" into nyc-mr2-dev-plus-aosp am:
a27aba8c4a -s ours" into oc-dev-plus-aosp
Jeremy Joslin [Thu, 11 May 2017 00:18:48 +0000 (00:18 +0000)]
Merge "Adding a new config and Setting for WiFi Wakeup." into oc-dev
am:
b569eedf37
Change-Id: Id4e9f4644bc470d1a3b8813502eb3e1e2ca45f05
TreeHugger Robot [Thu, 11 May 2017 00:18:32 +0000 (00:18 +0000)]
Merge "Fixed autofill dumpsys and improved logging." into oc-dev
Brad Ebinger [Thu, 11 May 2017 00:18:29 +0000 (00:18 +0000)]
Merge "Merge "Notify ImsService Status Correctly" am:
1bb9181380 am:
6d249dc08c" into nyc-mr2-dev-plus-aosp
am:
a27aba8c4a -s ours
Change-Id: Icf812ff6e9269942cf1ce5318356907a57cc2b80
Makoto Onuki [Thu, 11 May 2017 00:15:47 +0000 (00:15 +0000)]
Merge "Reconnect to DAService after binding is dead" into oc-dev
am:
ef5700667f
Change-Id: I03049914406ed38f92c3a6a43a82f55504c6e518
Albert Chaulk [Wed, 19 Apr 2017 19:54:08 +0000 (15:54 -0400)]
Propagate UIDs for all SurfaceControl instances
Previously, a default value was being propagated for surfaces constructed
though paths other than WindowManagerService.createSurfaceControl. This
allows us to handle all surfaces in VR in a better way
Bug:
36589137
Test: Launch chrome (uses SurfaceView)
Change-Id: I8434c356ebe51173cae161ec1405e3d5f9a17723
OSDN Git Service
