OSDN Git Service
TreeHugger Robot [Wed, 20 Sep 2017 21:13:07 +0000 (21:13 +0000)]
Merge "StatsCompanionService sends messages to statsd"
TreeHugger Robot [Wed, 20 Sep 2017 20:47:06 +0000 (20:47 +0000)]
Merge "incidentd: fix memory leaks in a test"
Jeffrey Huang [Wed, 20 Sep 2017 20:27:08 +0000 (20:27 +0000)]
Merge "Add metric for oem unlock dialog"
Mike Reed [Wed, 20 Sep 2017 17:17:54 +0000 (17:17 +0000)]
Merge "switch to unique_ptr version of Skia stream api"
Bookatz [Fri, 8 Sep 2017 18:58:42 +0000 (11:58 -0700)]
StatsCompanionService sends messages to statsd
StatsCompanionService can now inform statsd that an alarm (for anomaly
alerting and for polling) has fired, so that statsd can act accordingly.
Test: manual created an alarm from statsd.main and checked logcat that
statsd received the broadcast that it fired
Change-Id: I1d33dfbee0d3e213c91dd6973d2622ecacc890c8
Richard Coles [Wed, 20 Sep 2017 14:38:25 +0000 (14:38 +0000)]
Merge "Consider shared libs when precreating WebView classloader."
Adam Bookatz [Wed, 20 Sep 2017 14:01:49 +0000 (14:01 +0000)]
Merge changes I82fe220e,Iff324c73,I3bd73acd
* changes:
indexed priority queue for AnomalyMonitor
StatsCompanionService connection to Statsd
Set up StatsCompanionService.java
Shubham Ajmera [Wed, 20 Sep 2017 10:03:23 +0000 (10:03 +0000)]
Merge "Partially revert
ce54397368dc98182d7b4eb2ff3c142bbd87e39d" into oc-mr1-dev am:
2cdfda1232
am:
d4083dc339
Change-Id: Ic4b97b9d378f379bfbc00c6d2566c1712a2edf07
Sungsoo Lim [Wed, 20 Sep 2017 09:57:47 +0000 (09:57 +0000)]
Merge "Select a system audio route only when needed" into oc-mr1-dev am:
d4aee713d4
am:
cf874bbe6f
Change-Id: I79a44736931cea34eb6d00a62ae33b569021e9e4
Hugo Benichi [Wed, 20 Sep 2017 09:50:32 +0000 (09:50 +0000)]
Merge changes Ied9d0cec,I3087f446,Ibe706872 into oc-mr1-dev am:
14676c5da4
am:
b7de1a86b5
Change-Id: I1797f0c7ad3ddd7d6f509c093f9a16f007a7fe5d
Christine Franks [Wed, 20 Sep 2017 09:44:34 +0000 (09:44 +0000)]
Merge "Handle night display state when timezone changes" into oc-mr1-dev am:
1276f357d3
am:
1cdb151ef7
Change-Id: Ibb9931592abf7c8c8743fd52872ae6fed785a992
Christine Franks [Fri, 25 Aug 2017 20:57:26 +0000 (13:57 -0700)]
Handle night display state when timezone changes
Bug:
64458884
Test: runtest -c com.android.server.NightDisplayServiceTest \
frameworks-services and manually tested Hawaii and London
Change-Id: I052034a4c64eb73c42672215e8847c11e00efeb5
(cherry picked from commit
2ce862c3ed3739c4bb794794fb57e00fe233a3d5)
Shubham Ajmera [Wed, 20 Sep 2017 03:18:33 +0000 (03:18 +0000)]
Merge "Partially revert
ce54397368dc98182d7b4eb2ff3c142bbd87e39d" into oc-mr1-dev
am:
2cdfda1232
Change-Id: If3060eb7b21a3bb5f6b34b36de012cb35e4f03c9
TreeHugger Robot [Wed, 20 Sep 2017 03:11:22 +0000 (03:11 +0000)]
Merge "Partially revert
ce54397368dc98182d7b4eb2ff3c142bbd87e39d" into oc-mr1-dev
Sungsoo Lim [Wed, 20 Sep 2017 03:02:28 +0000 (03:02 +0000)]
Merge "Select a system audio route only when needed" into oc-mr1-dev
am:
d4aee713d4
Change-Id: Ifa91341cb48c970f9b19c6f8bc0219c1a3372a9a
TreeHugger Robot [Wed, 20 Sep 2017 02:54:45 +0000 (02:54 +0000)]
Merge "Select a system audio route only when needed" into oc-mr1-dev
Hugo Benichi [Wed, 20 Sep 2017 01:05:15 +0000 (01:05 +0000)]
Merge changes Ied9d0cec,I3087f446,Ibe706872 into oc-mr1-dev
am:
14676c5da4
Change-Id: I34613d4e53c6cc33029e1f8030b0605100cc59fc
Felipe Leme [Wed, 20 Sep 2017 00:59:11 +0000 (00:59 +0000)]
Merge "Handle autofill auth scenarios where the FillContext cannot be retrieved:" into oc-mr1-dev am:
5488a38465
am:
3ac60cbbe0
Change-Id: Ia59feec4ad1a442f6ade75eab8f3e49946d9f11b
Hugo Benichi [Wed, 20 Sep 2017 00:58:35 +0000 (00:58 +0000)]
Merge changes Ied9d0cec,I3087f446,Ibe706872 into oc-mr1-dev
* changes:
Wakeup packet events: addressing a few comments
Connectivity metrics: add WakeupStats events
Connectivity metrics: collect NFLOG wakeup events
David Stevens [Wed, 20 Sep 2017 00:50:48 +0000 (00:50 +0000)]
Merge "Merge "Handle showWhenLocked on secondary displays" into oc-mr1-dev am:
9282193c84" into oc-mr1-dev-plus-aosp
am:
ffdeee01ed
Change-Id: I8a03b9a31b27b88e10f64a4707e010b1db7945ca
Christine Franks [Wed, 20 Sep 2017 00:43:12 +0000 (00:43 +0000)]
Merge "Handle night display state when timezone changes" into oc-mr1-dev
am:
1276f357d3
Change-Id: I96cc0161eb092f2a965efbff4a417bc992493625
Felipe Leme [Wed, 20 Sep 2017 00:33:23 +0000 (00:33 +0000)]
Merge "Handle autofill auth scenarios where the FillContext cannot be retrieved:" into oc-mr1-dev
am:
5488a38465
Change-Id: I40b5124559da062bad0bdb9405aa89ef10d12597
Jordan Liu [Wed, 20 Sep 2017 00:24:00 +0000 (00:24 +0000)]
Merge "Fix wrong reading the sms lengh of stored long sms in RUIM" am:
c8ad4a82c7 am:
649f3bf73f am:
56ed1f9c9d
am:
2869e57522
Change-Id: I5e70bd06ae409eb17989a3767b862d997d04cda2
Android Build Merger (Role) [Wed, 20 Sep 2017 00:23:32 +0000 (00:23 +0000)]
Merge "Merge "Handle showWhenLocked on secondary displays" into oc-mr1-dev am:
9282193c84" into oc-mr1-dev-plus-aosp
Christine Franks [Wed, 20 Sep 2017 00:23:28 +0000 (00:23 +0000)]
Merge "Handle night display state when timezone changes" into oc-mr1-dev
TreeHugger Robot [Wed, 20 Sep 2017 00:19:03 +0000 (00:19 +0000)]
Merge "Handle autofill auth scenarios where the FillContext cannot be retrieved:" into oc-mr1-dev
David Stevens [Wed, 20 Sep 2017 00:18:26 +0000 (00:18 +0000)]
Merge "Handle showWhenLocked on secondary displays" into oc-mr1-dev
am:
9282193c84
Change-Id: Idbd4d3f24dffaad11518dd3d4d16ca7c7137ee94
TreeHugger Robot [Wed, 20 Sep 2017 00:18:07 +0000 (00:18 +0000)]
Merge "Delete unused interface IAM.swapDockedAndFullscreenStack()"
Jordan Liu [Wed, 20 Sep 2017 00:12:10 +0000 (00:12 +0000)]
Merge "Fix wrong reading the sms lengh of stored long sms in RUIM" am:
c8ad4a82c7 am:
649f3bf73f
am:
56ed1f9c9d
Change-Id: I039843725244d892248591cf4e88e1840e506733
TreeHugger Robot [Wed, 20 Sep 2017 00:09:09 +0000 (00:09 +0000)]
Merge "ActivityOptions.set/getLaunchStackId() be gone!"
David Stevens [Wed, 20 Sep 2017 00:09:04 +0000 (00:09 +0000)]
Merge "Handle showWhenLocked on secondary displays" into oc-mr1-dev
Philip Quinn [Mon, 18 Sep 2017 16:47:48 +0000 (09:47 -0700)]
Add HeadsUpManager as a SystemUI dependency.
Bug:
65849819
Test: make -j
Change-Id: Id4386aa267c512b9828480d42214b51093e73587
Jordan Liu [Wed, 20 Sep 2017 00:04:56 +0000 (00:04 +0000)]
Merge "Fix wrong reading the sms lengh of stored long sms in RUIM" am:
c8ad4a82c7
am:
649f3bf73f
Change-Id: If8b12685886ccbdecdb4e123629edc4e3426711d
Daniel Sandler [Wed, 20 Sep 2017 00:04:51 +0000 (00:04 +0000)]
Merge "OWNERS files don't really work with groups yet."
Dan Sandler [Tue, 19 Sep 2017 23:38:18 +0000 (19:38 -0400)]
OWNERS files don't really work with groups yet.
Test: n/a
Exempt-From-Owner-Approval: for obvious reasons
Change-Id: Ie41fbae528fa213e092411b38dda5a84b1288b22
Jordan Liu [Tue, 19 Sep 2017 23:55:48 +0000 (23:55 +0000)]
Merge "Fix wrong reading the sms lengh of stored long sms in RUIM"
am:
c8ad4a82c7
Change-Id: Id1af6c8abd901f981ad1abfa5fbf4887ee694c17
George Burgess IV [Tue, 19 Sep 2017 23:36:02 +0000 (16:36 -0700)]
incidentd: fix memory leaks in a test
The static analyzer found many memory leaks in this file. Converting
everything to use unique_ptr became really ugly, and involved lots of
copying from lists of unique_ptr<Privacy> to lists of Privacy*. Since
these tests really don't seem to allocate much, freeing everything en
masse at the end should be good enough.
Bug:
27101951
Test: mma; memory leak warnings are gone. Running
/data/nativetest64/incidentd_test/incidentd_test shows no failures.
Change-Id: I151b7ef4e02ee736e4e833924c0500e8dbedcc49
Bryce Lee [Tue, 19 Sep 2017 23:41:16 +0000 (23:41 +0000)]
Merge "Consider task's root activity when determining if resizable." into oc-mr1-dev am:
1c2a6921c0
am:
dbb33c058b
Change-Id: If3caf66edc965a46df24e2aaf4e73b83aebcbf67
Jordan Liu [Tue, 19 Sep 2017 23:39:42 +0000 (23:39 +0000)]
Merge "Fix wrong reading the sms lengh of stored long sms in RUIM"
Bryce Lee [Tue, 19 Sep 2017 23:32:17 +0000 (23:32 +0000)]
Merge "Consider task's root activity when determining if resizable." into oc-mr1-dev
am:
1c2a6921c0
Change-Id: I06e858733e21220b6008bd55c2d4119bc51cd2cd
Bryce Lee [Tue, 19 Sep 2017 23:21:54 +0000 (23:21 +0000)]
Merge "Consider task's root activity when determining if resizable." into oc-mr1-dev
Bryce Lee [Fri, 15 Sep 2017 00:06:41 +0000 (17:06 -0700)]
Consider task's root activity when determining if resizable.
We consider an activity resizable if the root activity of the its
parent task is resizable. This changelist adds this condition to
consideration.
Change-Id: I4162ff7eb6cad3f4a3f9fdf35ccc0b0d2383ff15
Fixes:
65668913
Test: bit FrameworksServicesTests:com.android.server.am.ActivityRecordTests#testCanBeLaunchedOnDisplay
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerDisplayTests#testLaunchNonResizeableActivityFromSecondaryDisplaySameTask
Felipe Leme [Tue, 19 Sep 2017 23:12:44 +0000 (23:12 +0000)]
Merge "Autofill optimization: don't contact server when session is finished." into oc-mr1-dev am:
2748ffcef7
am:
667fb12d37
Change-Id: Ib4d8b85be3d38131d606569913939d10199c63f7
Felipe Leme [Tue, 19 Sep 2017 23:01:33 +0000 (23:01 +0000)]
Merge "Autofill optimization: don't contact server when session is finished." into oc-mr1-dev
am:
2748ffcef7
Change-Id: I912d263f40e3d1cc58c77f2a91c585bb97aa3c37
TreeHugger Robot [Tue, 19 Sep 2017 22:47:16 +0000 (22:47 +0000)]
Merge "Autofill optimization: don't contact server when session is finished." into oc-mr1-dev
Ajay Nadathur [Tue, 19 Sep 2017 22:37:44 +0000 (22:37 +0000)]
Merge "Deferred setup banner updates intermittently" into oc-mr1-dev am:
19e00be16b
am:
f4f1c4d425
Change-Id: I0045019061b59d08e576a0c343f694804668870a
Calin Juravle [Tue, 19 Sep 2017 22:30:03 +0000 (22:30 +0000)]
Merge "Fix dexopt dump" into oc-mr1-dev am:
479af339de
am:
97de54bdda
Change-Id: Iaeb4ce6d248ae988ffd68a609bb572d600bc1698
Ajay Nadathur [Tue, 19 Sep 2017 22:26:00 +0000 (22:26 +0000)]
Merge "Deferred setup banner updates intermittently" into oc-mr1-dev
am:
19e00be16b
Change-Id: I2ba4882632e59141c9b1de697928d5a3a7a413fc
Calin Juravle [Tue, 19 Sep 2017 22:20:29 +0000 (22:20 +0000)]
Merge "Add an explicit reason for the compilation of shared apks" into oc-mr1-dev am:
d78d269650
am:
3489d1900b
Change-Id: I274b9c580e1e399e9575ba7de23925666f2e9276
Calin Juravle [Tue, 19 Sep 2017 22:17:53 +0000 (22:17 +0000)]
Merge "Fix dexopt dump" into oc-mr1-dev
am:
479af339de
Change-Id: I1ce2dd66298058e26e623ed39eec413575a10a7c
TreeHugger Robot [Tue, 19 Sep 2017 22:13:28 +0000 (22:13 +0000)]
Merge "Deferred setup banner updates intermittently" into oc-mr1-dev
Calin Juravle [Tue, 19 Sep 2017 22:09:56 +0000 (22:09 +0000)]
Merge "Add an explicit reason for the compilation of shared apks" into oc-mr1-dev
am:
d78d269650
Change-Id: I18243e9c77c921d5b860ccfe4bb021e21e8bb5e7
Calin Juravle [Tue, 19 Sep 2017 21:58:14 +0000 (21:58 +0000)]
Merge "Fix dexopt dump" into oc-mr1-dev
Calin Juravle [Tue, 19 Sep 2017 21:56:41 +0000 (21:56 +0000)]
Merge "Add an explicit reason for the compilation of shared apks" into oc-mr1-dev
Shubham Ajmera [Tue, 19 Sep 2017 21:07:05 +0000 (14:07 -0700)]
Partially revert
ce54397368dc98182d7b4eb2ff3c142bbd87e39d
We have already reverted A/B dexopt for secondary dex files in commit
7c1471197427b59f99578fd2483b1e113ba4b7f1. This removes secondary dex
opt during boot after OTA.
Bug:
65067046
Test: make and boot.
Change-Id: I76009ed609a608e009a50860b53a8dfed9d57334
Christine Franks [Fri, 25 Aug 2017 20:57:26 +0000 (13:57 -0700)]
Handle night display state when timezone changes
Bug:
64458884
Test: runtest -c com.android.server.NightDisplayServiceTest \
frameworks-services and manually tested Hawaii and London
Change-Id: I052034a4c64eb73c42672215e8847c11e00efeb5
TreeHugger Robot [Tue, 19 Sep 2017 21:14:26 +0000 (21:14 +0000)]
Merge "Make sure wm Stack gets override config on creation"
Sundeep Ghuman [Tue, 19 Sep 2017 21:11:09 +0000 (21:11 +0000)]
Merge "Do not pause scanning during Network state changes." into oc-mr1-dev am:
7b911fbdaf
am:
e62793a173
Change-Id: I61b9a273c95bb99085882c06ea209685fedd8c48
TreeHugger Robot [Tue, 19 Sep 2017 21:02:10 +0000 (21:02 +0000)]
Merge "Make NetworkController tests more deterministic"
Sundeep Ghuman [Tue, 19 Sep 2017 21:01:55 +0000 (21:01 +0000)]
Merge "Do not pause scanning during Network state changes." into oc-mr1-dev
am:
7b911fbdaf
Change-Id: I9f75901dcbaace37a44971a0e2b2dba02dedfa00
Mike Reed [Tue, 19 Sep 2017 21:01:30 +0000 (17:01 -0400)]
switch to unique_ptr version of Skia stream api
Test: make
Change-Id: I49703b85fa3e7a256a0b0df7a7f53bc18a68e22b
John Reck [Tue, 19 Sep 2017 21:00:03 +0000 (21:00 +0000)]
Merge "Remove all FATAL_IFs from graphicsstats service" into oc-mr1-dev am:
879a9677b9
am:
7d7022f73a
Change-Id: Id45c62c6b7dd8f080ab54a1c2ee439fb0dd10c34
TreeHugger Robot [Tue, 19 Sep 2017 20:52:49 +0000 (20:52 +0000)]
Merge "Do not pause scanning during Network state changes." into oc-mr1-dev
Arthur Ishiguro [Tue, 19 Sep 2017 20:50:59 +0000 (20:50 +0000)]
Merge "Adds handle to NanoAppInstanceInfo Parcel" into oc-mr1-dev am:
0853fe8a53
am:
7c5be53554
Change-Id: Iff30607c66ae8b42307bce3e42f7f9f3471e8d03
John Reck [Tue, 19 Sep 2017 20:48:24 +0000 (20:48 +0000)]
Merge "Remove all FATAL_IFs from graphicsstats service" into oc-mr1-dev
am:
879a9677b9
Change-Id: I62eeec65e62e5f4d422b95847b7bbab93e1a4fbe
Arthur Ishiguro [Tue, 19 Sep 2017 20:42:28 +0000 (20:42 +0000)]
Merge "Adds handle to NanoAppInstanceInfo Parcel" into oc-mr1-dev
am:
0853fe8a53
Change-Id: Icefb1d6d21bcebfc5b16e5ec234c9f1c6043717f
TreeHugger Robot [Tue, 19 Sep 2017 20:33:25 +0000 (20:33 +0000)]
Merge "Remove all FATAL_IFs from graphicsstats service" into oc-mr1-dev
TreeHugger Robot [Tue, 19 Sep 2017 20:32:56 +0000 (20:32 +0000)]
Merge "Adds handle to NanoAppInstanceInfo Parcel" into oc-mr1-dev
Android Build Merger (Role) [Tue, 19 Sep 2017 20:15:27 +0000 (20:15 +0000)]
Merge "Merge "Mark uid as non-idle/FG-entitled when launching for fg service" into oc-mr1-dev am:
93243bf808 am:
b39679d4c4"
TreeHugger Robot [Tue, 19 Sep 2017 20:14:46 +0000 (20:14 +0000)]
Merge "Fix crash in TextView#setHint"
Christopher Tate [Tue, 19 Sep 2017 20:12:37 +0000 (20:12 +0000)]
Merge "Mark uid as non-idle/FG-entitled when launching for fg service" into oc-mr1-dev am:
93243bf808
am:
b39679d4c4
Change-Id: I9284ceee64957730cb6a9e0cd8542ae528808a8c
Wale Ogunwale [Tue, 19 Sep 2017 20:07:39 +0000 (13:07 -0700)]
Delete unused interface IAM.swapDockedAndFullscreenStack()
Deleting so I don't have to convert to the new windowing model later.
Test: Existing test pass.
Change-Id: I6adbe11348e3f01f4e32d8b404b6399d5eff7152
Christopher Tate [Tue, 19 Sep 2017 20:04:35 +0000 (20:04 +0000)]
Merge "Mark uid as non-idle/FG-entitled when launching for fg service" into oc-mr1-dev
am:
93243bf808
Change-Id: Ibb5a539d306c58a21844ff97e0ac2678dd55c8e3
TreeHugger Robot [Tue, 19 Sep 2017 19:50:42 +0000 (19:50 +0000)]
Merge "Mark uid as non-idle/FG-entitled when launching for fg service" into oc-mr1-dev
TreeHugger Robot [Tue, 19 Sep 2017 19:34:34 +0000 (19:34 +0000)]
Merge "Fix navbar colors on power menu"
Torne (Richard Coles) [Tue, 19 Sep 2017 19:21:29 +0000 (15:21 -0400)]
Consider shared libs when precreating WebView classloader.
The change to handling of the deprecated Apache HTTP library means that
the WebView implementation package might have a non-empty shared library
list. Make sure to fetch shared libraries when querying WebView
implementations, and take them into account when constructing both the
actual classpath to be used to precreate the classloader, and when
deciding what the cache key for the precreated classloader should be.
Change-Id: I5e1409358d935e1c9f325db434bc6d4ef8ead759
Fixes:
65574359
Test: launch anything that uses WebView
Fyodor Kupolov [Tue, 19 Sep 2017 19:04:36 +0000 (19:04 +0000)]
Merge "Fix AddAccountSettings memory leak" am:
104501fa29 am:
c17b4e5a14 am:
80e87f97c3
am:
c9117ddbfa
Change-Id: I6e565af0ec462e57ae38f0c4f09b8c52bb5c6ab4
Fyodor Kupolov [Tue, 19 Sep 2017 18:56:45 +0000 (18:56 +0000)]
Merge "Fix AddAccountSettings memory leak" am:
104501fa29 am:
c17b4e5a14
am:
80e87f97c3
Change-Id: Iff2f6a0dff9774d155961aafade36eeb5db5bc81
Felipe Leme [Tue, 19 Sep 2017 16:06:20 +0000 (09:06 -0700)]
Autofill optimization: don't contact server when session is finished.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Bug:
65414762
Change-Id: I214a7835727c3ff71de9dc65c8d6fe54507265fb
Fyodor Kupolov [Tue, 19 Sep 2017 18:48:54 +0000 (18:48 +0000)]
Merge "Fix AddAccountSettings memory leak" am:
104501fa29
am:
c17b4e5a14
Change-Id: Ie7dd4310f3937c2c3e0fc9d3590b1a7813c0abee
Fyodor Kupolov [Tue, 19 Sep 2017 18:42:07 +0000 (18:42 +0000)]
Merge "Fix AddAccountSettings memory leak"
am:
104501fa29
Change-Id: I844d7ce66a162ba1e72a099d429e17de9c72fb86
TreeHugger Robot [Tue, 19 Sep 2017 18:38:45 +0000 (18:38 +0000)]
Merge "Sysui doesn't have a bp, it has an mk..."
Jason Monk [Tue, 19 Sep 2017 13:52:43 +0000 (09:52 -0400)]
Make NetworkController tests more deterministic
Test: runtest systemui
Fixes:
63386204
Change-Id: I371c6897c929e70e61a44e116c5a508f494eff0c
Fyodor Kupolov [Tue, 19 Sep 2017 18:29:14 +0000 (18:29 +0000)]
Merge "Fix AddAccountSettings memory leak"
David Stevens [Thu, 24 Aug 2017 01:41:49 +0000 (18:41 -0700)]
Handle showWhenLocked on secondary displays
The keyguard has windows on the default display and the remote display
selected by MediaRouter. Keyguard occlusion only applies to the default
display. To make the activity showWhenLocked flag work on secondary
displays, pass the display id of the locked secondary display from the
SystemUi to KeyguardController and make its isKeyguardShowing method
take a displayId.
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testSecondaryDisplayShowWhenLocked
Bug:
64994006
Merged-In: Ib31fc76e9df469e97a59a181f09d457ceed4ef5f
Change-Id: Ib31fc76e9df469e97a59a181f09d457ceed4ef5f
David Stevens [Tue, 19 Sep 2017 18:13:46 +0000 (18:13 +0000)]
Merge "Handle showWhenLocked on secondary displays"
TreeHugger Robot [Tue, 19 Sep 2017 18:00:20 +0000 (18:00 +0000)]
Merge "Fix VectorDrawable dirty flag logic"
Arthur Ishiguro [Mon, 18 Sep 2017 19:07:44 +0000 (12:07 -0700)]
Adds handle to NanoAppInstanceInfo Parcel
- Since mHandle (UID) was not recorded in writeToParcel, it always
returned 0 as the UID. This resulted in error messages claiming
mismatches between the reported and actual UID of nanoapps when called
from an external process.
- Also fixes the Parcel constructor to actually read the mContexthubId
field.
Bug:
37785458
Test: Compile and load, verify error message doesn't appear
Change-Id: I2ff75f510aae549c741786f5746862256ea5a877
Wale Ogunwale [Fri, 8 Sep 2017 20:29:37 +0000 (13:29 -0700)]
ActivityOptions.set/getLaunchStackId() be gone!
Removed ActivityOptions.set/getLaunchStackId() and replacement
ActivityOptions.set/getWindowingMode() and set/getActivityType()
Test: Existing tests pass.
Test: go/wm-smoke
Bug:
64146578
Change-Id: Ifc1c35f7b13c335cdf1a1694208e9fe0aea0c1fa
Tyler Gunn [Tue, 19 Sep 2017 17:05:49 +0000 (17:05 +0000)]
Merge "Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables." am:
99d28ebbda am:
8b2e421025 am:
c26e534bef" into oc-mr1-dev-plus-aosp
am:
dfcd7852a2
Change-Id: Iff9efc0b5dbb0593592f95db5924d045cc68d8e1
Fyodor Kupolov [Tue, 19 Sep 2017 17:01:11 +0000 (17:01 +0000)]
Merge "Allow to enable WAL for testing" into oc-mr1-dev am:
14b86be8da
am:
48a272464c
Change-Id: I46e7494178f86e56faa214cca709fd360659cb73
Android Build Merger (Role) [Tue, 19 Sep 2017 16:56:47 +0000 (16:56 +0000)]
Merge "Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables." am:
99d28ebbda am:
8b2e421025 am:
c26e534bef" into oc-mr1-dev-plus-aosp
Tyler Gunn [Tue, 19 Sep 2017 16:52:09 +0000 (16:52 +0000)]
Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables." am:
99d28ebbda am:
8b2e421025
am:
c26e534bef
Change-Id: I447794014fe74f6efb4c712808704b8b0f8bc43f
David Stevens [Tue, 19 Sep 2017 16:51:58 +0000 (16:51 +0000)]
Merge "Listen for device power state for VrMode" into oc-mr1-dev am:
71267deb18
am:
2f5c306b82
Change-Id: I5dba0293e924890977f5ce2333152dffdd8132ee
Fyodor Kupolov [Tue, 19 Sep 2017 16:51:50 +0000 (16:51 +0000)]
Merge "Allow to enable WAL for testing" into oc-mr1-dev
am:
14b86be8da
Change-Id: I7902b082d55063a902576b300295a771b64238b4
Fyodor Kupolov [Tue, 19 Sep 2017 16:45:39 +0000 (16:45 +0000)]
Merge "Allow to enable WAL for testing" into oc-mr1-dev
Tyler Gunn [Tue, 19 Sep 2017 16:44:26 +0000 (16:44 +0000)]
Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables." am:
99d28ebbda
am:
8b2e421025
Change-Id: I2b73595add333660c2a4b62538334b8cb38ac9cb
David Stevens [Tue, 19 Sep 2017 16:44:05 +0000 (16:44 +0000)]
Merge "Listen for device power state for VrMode" into oc-mr1-dev
am:
71267deb18
Change-Id: I8c84eed94013f07e1c0eabe020cd4e8eeee1f7ba
Tyler Gunn [Tue, 19 Sep 2017 16:37:38 +0000 (16:37 +0000)]
Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables."
am:
99d28ebbda
Change-Id: I99ff94901868d3b16a20a6592e106bc0645b863e
David Stevens [Tue, 19 Sep 2017 16:35:28 +0000 (16:35 +0000)]
Merge "Listen for device power state for VrMode" into oc-mr1-dev