OSDN Git Service
Hassan Shojania [Fri, 21 Apr 2017 03:08:24 +0000 (03:08 +0000)]
Merge "MediaPlayer/ModularDrm API review: Document/runtime exception update" into oc-dev
am:
652d006d6b
Change-Id: Iaf2580d742329db0280d8d466bb40482419099fd
Felipe Leme [Fri, 21 Apr 2017 03:02:59 +0000 (03:02 +0000)]
Merge "Implemented FillResponse.setIgnoredIds()." into oc-dev
am:
bb21986b33
Change-Id: I9dcc532eb2774a523a7d53495a53323a4799dbf8
Hassan Shojania [Fri, 21 Apr 2017 02:58:21 +0000 (02:58 +0000)]
Merge "MediaPlayer/ModularDrm API review: Document/runtime exception update" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 02:54:05 +0000 (02:54 +0000)]
Merge "Implemented FillResponse.setIgnoredIds()." into oc-dev
gaoshang [Fri, 21 Apr 2017 02:42:02 +0000 (02:42 +0000)]
Merge "fix KeyEvent can't correctly finish when inputmethod time out happend" into oc-dev
am:
56879000d9
Change-Id: I3bc0e45e4b801f8b6a2cdb555a8b2b825a259b6c
TreeHugger Robot [Fri, 21 Apr 2017 02:36:06 +0000 (02:36 +0000)]
Merge "fix KeyEvent can't correctly finish when inputmethod time out happend" into oc-dev
Android Build Merger (Role) [Fri, 21 Apr 2017 02:23:38 +0000 (02:23 +0000)]
Merge "Merge "Add BitUtils (from "Support multiple filters per association request")" am:
1321e592fe am:
232198d02b am:
00aae481fa -s ours" into oc-dev-plus-aosp
Hugo Benichi [Fri, 21 Apr 2017 02:22:57 +0000 (02:22 +0000)]
Merge "Add BitUtils (from "Support multiple filters per association request")" am:
1321e592fe am:
232198d02b
am:
00aae481fa -s ours
Change-Id: I77254db8a3b974e6e09881610af983edea1309a6
Daichi Hirono [Fri, 21 Apr 2017 02:20:37 +0000 (02:20 +0000)]
Merge "Stop restoring tasks added before recent is loaded" into oc-dev
am:
495ecd9d56
Change-Id: I619cd6f13a11e757d4275ba4afc427eb325f1a6b
Hangyu Kuang [Fri, 21 Apr 2017 02:18:47 +0000 (02:18 +0000)]
Merge "media: Change setNextOutputFile to address API review comments." into oc-dev
am:
0e6cce9de1
Change-Id: I3c3070b5183281ccd8a31408f18f6c7dd3c7ca21
Hugo Benichi [Fri, 21 Apr 2017 02:16:20 +0000 (02:16 +0000)]
Merge "Add BitUtils (from "Support multiple filters per association request")" am:
1321e592fe
am:
232198d02b
Change-Id: I755f87e0dbe8169de01ea5cd09094eed3555ee65
Christopher Tate [Fri, 21 Apr 2017 02:12:46 +0000 (02:12 +0000)]
Merge "Fix #
37305009 : Beam crash in secondary users" into oc-dev
am:
68bfea8a5d
Change-Id: Ib449f03ac48eb534c75d539ce38f295444098cb4
TreeHugger Robot [Fri, 21 Apr 2017 02:12:34 +0000 (02:12 +0000)]
Merge "Stop restoring tasks added before recent is loaded" into oc-dev
Jeff Sharkey [Fri, 21 Apr 2017 02:10:23 +0000 (02:10 +0000)]
Merge "Auto-generate docs based on annotations." into oc-dev
am:
9ea4b33f2a
Change-Id: Ic81a77a4fc3bb3638b8b53037c58efc9b26bbb7a
Hugo Benichi [Fri, 21 Apr 2017 02:09:14 +0000 (02:09 +0000)]
Merge "Add BitUtils (from "Support multiple filters per association request")"
am:
1321e592fe
Change-Id: Ibe263aeb2868b75f0a7a75895c68a5aaf2ddfa38
TreeHugger Robot [Fri, 21 Apr 2017 02:06:13 +0000 (02:06 +0000)]
Merge "media: Change setNextOutputFile to address API review comments." into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 02:04:12 +0000 (02:04 +0000)]
Merge "Fix #
37305009 : Beam crash in secondary users" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 02:03:29 +0000 (02:03 +0000)]
Merge "Auto-generate docs based on annotations." into oc-dev
Andrii Kulian [Fri, 21 Apr 2017 02:03:20 +0000 (02:03 +0000)]
Merge "Always create display content with system identity" into oc-dev
am:
941264de7d
Change-Id: Ic551693590bc817479ea6519a3a87bfc1ad17de8
Sudheer Shanka [Fri, 21 Apr 2017 02:01:26 +0000 (02:01 +0000)]
Merge "Update ClipDescription.getTimeStamp to use currentTimeMillis timebase." into oc-dev
am:
2cef335b5b
Change-Id: Ife25840cfbfae896e00bb387915cf3a327da1185
Hugo Benichi [Fri, 21 Apr 2017 01:58:14 +0000 (01:58 +0000)]
Merge "Add BitUtils (from "Support multiple filters per association request")"
Andrii Kulian [Fri, 21 Apr 2017 01:52:15 +0000 (01:52 +0000)]
Merge "Always create display content with system identity" into oc-dev
Sudheer Shanka [Fri, 21 Apr 2017 01:51:22 +0000 (01:51 +0000)]
Merge "Update ClipDescription.getTimeStamp to use currentTimeMillis timebase." into oc-dev
Christopher Tate [Fri, 21 Apr 2017 01:51:14 +0000 (01:51 +0000)]
Merge "OOM-adjust an app to the foreground for startForegroundService" into oc-dev
am:
305d30f786
Change-Id: Ifb52cf1189b3aa15b7bee12e1071130e77bef5d1
TreeHugger Robot [Fri, 21 Apr 2017 01:42:29 +0000 (01:42 +0000)]
Merge "OOM-adjust an app to the foreground for startForegroundService" into oc-dev
Stanley Tng [Fri, 21 Apr 2017 01:38:54 +0000 (01:38 +0000)]
Merge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)" am:
c5680c9b05 am:
16609dfe18
am:
559f49a4a8
Change-Id: I6fa8f334a84132e121db7c517ea50ff8d8047611
Stanley Tng [Fri, 21 Apr 2017 01:30:21 +0000 (01:30 +0000)]
Merge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)" am:
c5680c9b05
am:
16609dfe18
Change-Id: I9c9c500bab98168da48d69cc7e4c93a33b8571bd
Felipe Leme [Fri, 21 Apr 2017 01:25:39 +0000 (01:25 +0000)]
Merge "Fixed NPE on dump() and other minor fixes..." into oc-dev
am:
dbc020983d
Change-Id: I659fe602b3ae98da50e7a771e74c334570979b30
Stanley Tng [Fri, 21 Apr 2017 01:25:00 +0000 (01:25 +0000)]
Merge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)"
am:
c5680c9b05
Change-Id: I63e35a957feb76517fb7559ecb6ac114109341ee
TreeHugger Robot [Fri, 21 Apr 2017 01:20:19 +0000 (01:20 +0000)]
Merge "Fixed NPE on dump() and other minor fixes..." into oc-dev
Phil Weaver [Fri, 21 Apr 2017 01:17:44 +0000 (01:17 +0000)]
Merge "Fix a11y text location in clipped views" into oc-dev
am:
6a60322157
Change-Id: Ia0bc461e0d7e1c4b5a10952c3a52b314a6a22379
Treehugger Robot [Fri, 21 Apr 2017 01:16:31 +0000 (01:16 +0000)]
Merge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)"
TreeHugger Robot [Fri, 21 Apr 2017 01:11:07 +0000 (01:11 +0000)]
Merge "Fix a11y text location in clipped views" into oc-dev
Felipe Leme [Thu, 20 Apr 2017 22:58:30 +0000 (15:58 -0700)]
Implemented FillResponse.setIgnoredIds().
Fixes:
37424141
Test: existing CtsAutoFillServiceTestCases pass
Test: PartitionedActivityTest.testIgnoredFieldsDontTriggerAutofill
Change-Id: I09bd95230c45d2970080514e25cb53320de49b56
Sunny Goyal [Fri, 21 Apr 2017 00:38:07 +0000 (00:38 +0000)]
Merge "Renaming setAsyncExecutor to setExecutor" into oc-dev
am:
82629345c8
Change-Id: I11e9363b75490c5ca689f0b750cc948c98136f74
Jesse Evans [Fri, 21 Apr 2017 00:36:06 +0000 (00:36 +0000)]
Merge "browserIntent needs proper flags for PendingIntent" into oc-dev
am:
a8851447ef
Change-Id: Ie5a3c4c96c7a8a41b630ff5c84f8d03eedaa95c6
TreeHugger Robot [Fri, 21 Apr 2017 00:31:05 +0000 (00:31 +0000)]
Merge "Renaming setAsyncExecutor to setExecutor" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 00:30:15 +0000 (00:30 +0000)]
Merge "browserIntent needs proper flags for PendingIntent" into oc-dev
Phil Weaver [Fri, 21 Apr 2017 00:20:43 +0000 (00:20 +0000)]
Merge "Hide API to listen to a11y service state" into oc-dev
am:
4a5ea54710
Change-Id: Iab5cd8541580b114ad2679c5127444182b87a9bf
Phil Weaver [Fri, 21 Apr 2017 00:11:03 +0000 (00:11 +0000)]
Merge "Hide API to listen to a11y service state" into oc-dev
George Mount [Fri, 21 Apr 2017 00:06:58 +0000 (00:06 +0000)]
Merge "Kill running animations on fragment view's when removed." into oc-dev
am:
dcc7feb329
Change-Id: If86dd400ef47c543bd62d621f6a16cecf178014b
George Mount [Thu, 20 Apr 2017 23:57:22 +0000 (23:57 +0000)]
Merge "Execute pending transactions after FM state change." into oc-dev
am:
d58d802c5f
Change-Id: I03dd1d557b83bd98086330fd2006ec194be62b1b
TreeHugger Robot [Thu, 20 Apr 2017 23:52:41 +0000 (23:52 +0000)]
Merge "Kill running animations on fragment view's when removed." into oc-dev
TreeHugger Robot [Thu, 20 Apr 2017 23:51:03 +0000 (23:51 +0000)]
Merge "Execute pending transactions after FM state change." into oc-dev
Felipe Leme [Thu, 20 Apr 2017 23:47:48 +0000 (23:47 +0000)]
Merge "Added missing important-for-autofill mappings." into oc-dev
am:
b8305e9186
Change-Id: I5f229b698cea897cc63e42991084194b272c8c30
Michael Plass [Thu, 20 Apr 2017 23:45:35 +0000 (23:45 +0000)]
Merge "Deprecate BSSID Hostlist system API" into oc-dev
am:
5fc916d852
Change-Id: I8b4b1b2b90e8d141b416adbc53c3e10ba64c2a86
TreeHugger Robot [Thu, 20 Apr 2017 23:43:33 +0000 (23:43 +0000)]
Merge "Added missing important-for-autofill mappings." into oc-dev
Michael Plass [Thu, 20 Apr 2017 23:37:47 +0000 (23:37 +0000)]
Merge "Deprecate BSSID Hostlist system API" into oc-dev
Andrii Kulian [Thu, 20 Apr 2017 23:02:47 +0000 (16:02 -0700)]
Always create display content with system identity
If an app tried to use a virtual display that it had just created
and add a window to it before it was registered in WM, WM would try
to create a DisplayContent instance. This would be executed with
app's calling identity and fail permission check.
This CL ensures that we always clear the calling identity before
creating display content.
Bug:
37422998
Test: android.display.cts.VirtualDisplayTest#testPrivateVirtualDisplay
Change-Id: I442cca65055886b384a28eeefcc35f2a36e482d0
Stanley Tng [Tue, 18 Apr 2017 05:35:45 +0000 (22:35 -0700)]
Allow the Bluetooth MAC address to be updated asynchronously (2/3)
There are intermittent issues where either the returned Bluetooth
MAC address to Java framework is uninitialized or this address update
arrives too late. This fix will do 2 things:
(1) Returns error when MAC address is unavailable in the native code.
(2) Updates the MAC address later by adding a new broadcast event.
Test: Check address for these cases: factory reset, system reboot, and
Bluetooth re-enable.
Bug:
36709382
Change-Id: I09720193e38fdf9139e1bb146f8e1847e2b65b1a
Christopher Tate [Thu, 20 Apr 2017 23:24:31 +0000 (16:24 -0700)]
Fix #
37305009 : Beam crash in secondary users
The background-policy check for a-priori app uids needs to be an appId
check rather than nominal uid.
Along the way, even though the code is not invoked after the boot
sequence currently, make the "is this uid on the a-priori list?"
check thread safe.
Bug
37305009
Test: manual
Change-Id: I7c2525f86e73b213057cd4b7f327191ec20c4a6d
Jeff Sharkey [Thu, 20 Apr 2017 05:24:18 +0000 (23:24 -0600)]
Auto-generate docs based on annotations.
We have a handful of annotations that we've been sprinkling across
the platform APIs, such as @Nullable, @NonNull, @IntDef, etc. It
would be really helpful to surface these contracts to developers
through the SDK docs.
This change allows annotations like those mentioned above to declare
the following new javadoc fields:
@memberDoc: docs to append to a field or method definition.
@paramDoc: docs to append to a @param definition.
@returnDoc: docs to append to a @return definition.
This change also builds a docstring to describe the list of all
constants listed in an @IntDef annotation. Sadly AnnotationDesc
only passes along raw constant values, so we need the help of the
new "prefix" annotation argument to help find the field names.
Test: builds
Bug:
37526420
Change-Id: I4cfc00dd904e5dfa945b406d546e36846b7c0c28
Yang Ni [Thu, 20 Apr 2017 22:58:37 +0000 (22:58 +0000)]
Merge "Validates Intrinsic Blur only takes 2D Allocations" am:
b44f4d2f51 am:
0962a6e83c
am:
cfe40aa165
Change-Id: I7f191c2da99f310b4af599ab4849daeb90eb7497
Felipe Leme [Thu, 20 Apr 2017 22:46:18 +0000 (15:46 -0700)]
Fixed NPE on dump() and other minor fixes...
Bug:
36871500
Test: manual verification
Change-Id: I1c3a8406344280da37b728eae56f26447c48e0b2
Yang Ni [Thu, 20 Apr 2017 22:53:05 +0000 (22:53 +0000)]
Merge "Validates Intrinsic Blur only takes 2D Allocations" am:
b44f4d2f51
am:
0962a6e83c
Change-Id: I0b3c582cc9627567b4942eead98cdb0a2406d7c6
Yang Ni [Thu, 20 Apr 2017 22:47:34 +0000 (22:47 +0000)]
Merge "Validates Intrinsic Blur only takes 2D Allocations"
am:
b44f4d2f51
Change-Id: Ib2f8f8206fb77fad99c67d48b839231108e8d0cc
Yang Ni [Thu, 20 Apr 2017 22:37:20 +0000 (22:37 +0000)]
Merge "Validates Intrinsic Blur only takes 2D Allocations"
Sunny Goyal [Thu, 20 Apr 2017 22:25:47 +0000 (15:25 -0700)]
Renaming setAsyncExecutor to setExecutor
Bug:
37534990
Test: Tests updated
Change-Id: I9ea467d05b4ac4d96c23d53750727096a511686d
Jason Monk [Thu, 20 Apr 2017 22:26:58 +0000 (22:26 +0000)]
Merge "Fix status bar not hiding quickly" into oc-dev
am:
b0806f1006
Change-Id: Ie20ce6f63587222c2c0552078cf2846534cfa4c7
Jason Monk [Thu, 20 Apr 2017 22:18:18 +0000 (22:18 +0000)]
Merge "Fix status bar not hiding quickly" into oc-dev
Christopher Tate [Thu, 20 Apr 2017 21:48:13 +0000 (14:48 -0700)]
OOM-adjust an app to the foreground for startForegroundService
That is, OOM adjust it appropriately when the service is kicked off.
Previously it was mistakenly not recognizing the foreground intention
at the OOM level until the service called startForeground(), so there
was a period of inappropriate OOM vulnerability.
Bug
36990485
Test: manual
Change-Id: Ic9b56ef29d5120bf7912681900e9ebaeb0abc5d6
Jesse Evans [Thu, 20 Apr 2017 21:44:49 +0000 (14:44 -0700)]
browserIntent needs proper flags for PendingIntent
Previously the browserIntent was updated after the call to
PendingIntent.getActivity. It should be updated correctly
before the PendingIntent.getActivity call so that the
PendingIntent is correctly created for the browser instead
of the Instant App.
Test: Existing tests, manually tested fixed behavior.
Bug:
35873804
Change-Id: Ie77344a4190fbc6a3896b02e3adfcdd29985006d
Andrew Solovay [Thu, 20 Apr 2017 21:31:53 +0000 (21:31 +0000)]
Merge "docs: Restoring file to allow staging reference docs from Gerrit" into oc-dev
am:
106527e21e
Change-Id: Ia2490a5e5ad3bcf5ec66fbcc753bf135ccb3830f
TreeHugger Robot [Thu, 20 Apr 2017 21:23:59 +0000 (21:23 +0000)]
Merge "docs: Restoring file to allow staging reference docs from Gerrit" into oc-dev
Hangyu Kuang [Thu, 20 Apr 2017 20:53:48 +0000 (13:53 -0700)]
media: Change setNextOutputFile to address API review comments.
Bug:
37514763
Test: CTS test
Change-Id: If0fb59f26ecf3882600ca7a8b26b6c248615bbd0
George Mount [Thu, 20 Apr 2017 20:47:51 +0000 (20:47 +0000)]
Merge "fix NPE when fragment container is null" into oc-dev
am:
38eae1bb15
Change-Id: I51b07b1e8f05410737205539be630a0c463ddd3a
George Mount [Thu, 20 Apr 2017 20:38:07 +0000 (20:38 +0000)]
Merge "fix NPE when fragment container is null" into oc-dev
Makoto Onuki [Thu, 20 Apr 2017 20:23:47 +0000 (20:23 +0000)]
Merge "Enhance the shortcut manager javadoc." into oc-dev
am:
aeb7505a7f
Change-Id: Iefc3efbdc1fc8ffbe1953a24686fc94e7f67da5d
George Mount [Thu, 20 Apr 2017 20:16:52 +0000 (13:16 -0700)]
fix NPE when fragment container is null
Bug
37529822
Test: ran against breaking application
Change-Id: Ib829b817eddf2e91898989a2f9e7885a6f5847e5
Makoto Onuki [Thu, 20 Apr 2017 20:14:23 +0000 (20:14 +0000)]
Merge "Enhance the shortcut manager javadoc." into oc-dev
Chad Brubaker [Thu, 20 Apr 2017 19:59:51 +0000 (19:59 +0000)]
Merge "Address API review comments for registerReceiver" into oc-dev
am:
1f4e053aef
Change-Id: I1ef3e3a515b6a12b96ca5cdee799a346a87b244f
Chad Brubaker [Thu, 20 Apr 2017 19:52:44 +0000 (19:52 +0000)]
Merge "Address API review comments for registerReceiver" into oc-dev
Phil Weaver [Thu, 20 Apr 2017 19:11:15 +0000 (12:11 -0700)]
Fix a11y text location in clipped views
Bug:
37482849
Test: Run Select to Speak, open apps, scroll so top row is
partially visible, have it read the screen.
Change-Id: Ibbd51221f8e93372ccff6d5fb57cdc2a09f2c19f
Seigo Nonaka [Thu, 20 Apr 2017 19:06:51 +0000 (19:06 +0000)]
Merge "Stop fetching font data if the context is restricted." into oc-dev
am:
4e45b1491a
Change-Id: I8eee6edde2790dd11b1221418bc222d11dc986f4
TreeHugger Robot [Thu, 20 Apr 2017 18:56:39 +0000 (18:56 +0000)]
Merge "Stop fetching font data if the context is restricted." into oc-dev
Colin Cross [Thu, 20 Apr 2017 18:39:18 +0000 (18:39 +0000)]
Merge "Convert libinputservice to Android.bp" am:
a070e55e34 am:
4ad5543b38
am:
8a5ea28a08 -s ours
Change-Id: Ifda775f6bdf83836dd8369dc5c6ee4f2f0d64f7a
Colin Cross [Thu, 20 Apr 2017 00:00:07 +0000 (17:00 -0700)]
Convert libinputservice to Android.bp
See build/soong/README.md for more information.
Test: m -j checkbuild
Change-Id: I3cd2bb05ec89c40ebd1240e352a19f99d00dc114
(cherry picked from commit
3fc8f2df3098a5bb8191cca43b4dc4cf3bba160b)
Sudheer Shanka [Thu, 20 Apr 2017 18:30:48 +0000 (11:30 -0700)]
Update ClipDescription.getTimeStamp to use currentTimeMillis timebase.
Bug:
37419581
Test: cts-tradefed run singleCommand cts-dev -m CtsContentTestCases -t \
android.content.cts.ClipDescriptionTest
Change-Id: I699bfc073c471534eee0b3aa0300a6b6682ab8dd
Makoto Onuki [Mon, 17 Apr 2017 17:55:21 +0000 (10:55 -0700)]
Enhance the shortcut manager javadoc.
Test: make -j offline-sdk-docs
Bug
37418396
Change-Id: Ic82eb45ea232c2f032abaade12ac9ca967c35cae
Colin Cross [Thu, 20 Apr 2017 18:20:43 +0000 (18:20 +0000)]
Merge "Convert libinputservice to Android.bp" am:
a070e55e34
am:
4ad5543b38
Change-Id: Ie902bac8bbca5663241a1d7651693930e06e8bf4
Conrad Chen [Thu, 20 Apr 2017 18:13:12 +0000 (18:13 +0000)]
Merge "Fix overlay view not updated during scaling TvView" into oc-dev
am:
047adbefe2
Change-Id: Id99a3e85a5b05ffd432a6f9285499d09d545edf0
Colin Cross [Thu, 20 Apr 2017 18:12:45 +0000 (18:12 +0000)]
Merge "Convert libinputservice to Android.bp"
am:
a070e55e34
Change-Id: Iec35b80b29b3802f3cc4323eea5ece37bb445977
Conrad Chen [Thu, 20 Apr 2017 18:08:09 +0000 (18:08 +0000)]
Merge "Fix overlay view not updated during scaling TvView" into oc-dev
Treehugger Robot [Thu, 20 Apr 2017 17:59:45 +0000 (17:59 +0000)]
Merge "Convert libinputservice to Android.bp"
Eugene Susla [Thu, 20 Apr 2017 17:57:40 +0000 (17:57 +0000)]
Merge "StopScan before each new Companion device scan" into oc-dev
am:
611797073f
Change-Id: Ia4d72f6e6d7a1073120152004ea7808636817d0e
Eugene Susla [Thu, 20 Apr 2017 17:50:55 +0000 (17:50 +0000)]
Merge "StopScan before each new Companion device scan" into oc-dev
Felipe Leme [Thu, 20 Apr 2017 17:36:31 +0000 (17:36 +0000)]
Merge "Moved getAutofillOptions() logic from SpinnerAbs to AdapterView and Adapter." into oc-dev
am:
f4af35a5fe
Change-Id: I6e627c5126cb0372dbde3bcaffadb8043cadacc2
Jason Monk [Thu, 20 Apr 2017 17:31:42 +0000 (17:31 +0000)]
Merge changes I8953967a,If17eddad into oc-dev
am:
b8abd8d867
Change-Id: I9d2462aa708a67d4a9fe4d5cde477b9f14e8d204
TreeHugger Robot [Thu, 20 Apr 2017 17:25:15 +0000 (17:25 +0000)]
Merge "Moved getAutofillOptions() logic from SpinnerAbs to AdapterView and Adapter." into oc-dev
Jason Monk [Thu, 20 Apr 2017 17:24:20 +0000 (17:24 +0000)]
Merge changes I8953967a,If17eddad into oc-dev
* changes:
Add go to web action for instant apps
Fix when instant app notif is showing
Jordan Liu [Thu, 20 Apr 2017 17:15:13 +0000 (17:15 +0000)]
Merge "Use SubscriptionId instead of SubId" into oc-dev
am:
8079a69eba
Change-Id: I6088d29019aa8dc872a354cbc0b63ddb87c95b00
Stephen Kiazyk [Thu, 20 Apr 2017 17:12:59 +0000 (17:12 +0000)]
Merge "Remove swipe to exit persistent Vr mode behavior" into oc-dev
am:
bd3d0dea88
Change-Id: I6105c334594e4996d76c0d3429a6ed81c7131cee
Android Build Merger (Role) [Thu, 20 Apr 2017 17:04:32 +0000 (17:04 +0000)]
Merge "Merge "DO NOT MERGE. SystemUI: Display RAT icon when data is off" am:
a0cef3c9c1 -s ours am:
8bb42caffb -s ours am:
00539a10a3 -s ours" into oc-dev-plus-aosp
Wenting Xiong [Thu, 20 Apr 2017 17:03:48 +0000 (17:03 +0000)]
Merge "DO NOT MERGE. SystemUI: Display RAT icon when data is off" am:
a0cef3c9c1 -s ours am:
8bb42caffb -s ours
am:
00539a10a3 -s ours
Change-Id: I755987da84380a31997d3c5a9a75bbdc0e432eae
Jordan Liu [Thu, 20 Apr 2017 17:02:50 +0000 (17:02 +0000)]
Merge "Use SubscriptionId instead of SubId" into oc-dev
TreeHugger Robot [Thu, 20 Apr 2017 17:02:11 +0000 (17:02 +0000)]
Merge "Remove swipe to exit persistent Vr mode behavior" into oc-dev
Sudheer Shanka [Thu, 20 Apr 2017 17:01:24 +0000 (17:01 +0000)]
Merge "Revert "Add new api Activity.getStartInitiatedTime."" into oc-dev
am:
8f40881e3e
Change-Id: Ifb5f33844d6f0c675b823a52af87d112a3c808b8
Bryce Lee [Thu, 20 Apr 2017 16:59:15 +0000 (16:59 +0000)]
Merge "Do not pause resumed activity in resumeTopActivityUncheckedLocked." into oc-dev
am:
9240fffcbb
Change-Id: I9a18f9f58dff2fb8eeee4ef3849593592d72667c
Wenting Xiong [Thu, 20 Apr 2017 16:57:31 +0000 (16:57 +0000)]
Merge "DO NOT MERGE. SystemUI: Display RAT icon when data is off" am:
a0cef3c9c1 -s ours
am:
8bb42caffb -s ours
Change-Id: I44fad7c2f04f01257cdc2873243657cac744bf22
Jason Monk [Thu, 20 Apr 2017 16:57:12 +0000 (16:57 +0000)]
Merge "Remove QS wifi alpha state animations, they need more work" into oc-dev
am:
3e5204a230
Change-Id: I3b85d04cc029b920b0f122094546b335b10afa01