OSDN Git Service
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
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"
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
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
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
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)
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
Jason Monk [Thu, 20 Apr 2017 16:55:21 +0000 (16:55 +0000)]
Merge "Fix touch target on QS date" into oc-dev
am:
aae6023996
Change-Id: I1ebc276b9017265c37cebe40ddd73dbcdf2ba715
Jason Monk [Thu, 20 Apr 2017 16:53:25 +0000 (16:53 +0000)]
Merge "Fix QS label layout" into oc-dev
am:
183137efe1
Change-Id: I4bfaf8ca09e1c6c04b0d55ac14167983f8530b46
Wenting Xiong [Thu, 20 Apr 2017 16:51:41 +0000 (16:51 +0000)]
Merge "DO NOT MERGE. SystemUI: Display RAT icon when data is off"
am:
a0cef3c9c1 -s ours
Change-Id: I5da0dee9e45352370b6b38c6995be080415d5588
Jason Monk [Thu, 20 Apr 2017 16:47:26 +0000 (16:47 +0000)]
Merge "Fix alpha on wifi disconnected icon" into oc-dev
am:
ea8f49ce8e
Change-Id: I05ad92026ffd50b8cdf68db3b14689e9593bdbaa
Jason Monk [Thu, 20 Apr 2017 16:45:29 +0000 (16:45 +0000)]
Merge "Fix alpha on wifi connected 4 bars no inet icon" into oc-dev
am:
d168f89b0a
Change-Id: I51df477cecebffb47c00f0bada88db3f428b0135
Jean-Michel Trivi [Thu, 20 Apr 2017 16:41:12 +0000 (16:41 +0000)]
Merge "Revert "Revert "AudioAttributes: remove static getVolumeControlStream method""" into oc-dev
am:
ac7f215124
Change-Id: I9dd175f1f457293369e01ad43791622329103cd9
Treehugger Robot [Thu, 20 Apr 2017 16:39:36 +0000 (16:39 +0000)]
Merge "DO NOT MERGE. SystemUI: Display RAT icon when data is off"
Martijn Coenen [Thu, 20 Apr 2017 16:39:15 +0000 (16:39 +0000)]
Merge "Stop hwbinder threads from app_process." into oc-dev
am:
fd25662e03
Change-Id: Ie21d1f60f75a6b3f78ece0596bd3ce7e07472cb7
Philipp Weiß [Thu, 20 Apr 2017 16:37:25 +0000 (16:37 +0000)]
Merge "Redesign QSSecurityFooter dialog" into oc-dev
am:
364b010cc7
Change-Id: Iab3525a568886e761be9e4ce9dfeb7263ba22442
Philipp Weiß [Thu, 20 Apr 2017 16:35:24 +0000 (16:35 +0000)]
Merge "String fixes in QSFooter" into oc-dev
am:
c08c170052
Change-Id: I4c8e2bcae3c3360c65f75bcd0ff636e0dd84a773
Rubin Xu [Thu, 20 Apr 2017 16:33:17 +0000 (16:33 +0000)]
Merge "Do not check user escrow state if synthetic password is not enabled yet" into oc-dev
am:
b156c3a006
Change-Id: I7453311ceb4547f18055b2856965d8f30f918f16
Sudheer Shanka [Thu, 20 Apr 2017 16:32:34 +0000 (16:32 +0000)]
Merge "Revert "Add new api Activity.getStartInitiatedTime."" into oc-dev
Bryce Lee [Thu, 20 Apr 2017 16:27:51 +0000 (16:27 +0000)]
Merge "Do not pause resumed activity in resumeTopActivityUncheckedLocked." into oc-dev
Phil Weaver [Thu, 20 Apr 2017 16:22:43 +0000 (16:22 +0000)]
Merge "Make a11y clickable span work after node recycle" into oc-dev
am:
5d25f429bf
Change-Id: Ic25383f328c9dbe82241bc8a726fc5fa854b7811
TreeHugger Robot [Thu, 20 Apr 2017 16:17:08 +0000 (16:17 +0000)]
Merge "Remove QS wifi alpha state animations, they need more work" into oc-dev
Android Build Merger (Role) [Thu, 20 Apr 2017 16:16:44 +0000 (16:16 +0000)]
Merge "Merge "Vulkan compute 0 only requires variable pointers" into oc-dev am:
45ff1d1ad3" into oc-dev-plus-aosp
Jesse Hall [Thu, 20 Apr 2017 16:15:50 +0000 (16:15 +0000)]
Merge "Vulkan compute 0 only requires variable pointers" into oc-dev
am:
45ff1d1ad3
Change-Id: I2aecffc6cd849e9809d51274d2f0028f1786cb4e
TreeHugger Robot [Thu, 20 Apr 2017 16:14:18 +0000 (16:14 +0000)]
Merge "Fix touch target on QS date" into oc-dev
Android Build Merger (Role) [Thu, 20 Apr 2017 16:14:16 +0000 (16:14 +0000)]
Merge "Merge "Deprecate Activity#requestVisibleBehind" into oc-dev am:
e4b6441198" into oc-dev-plus-aosp
Bryce Lee [Thu, 20 Apr 2017 16:12:54 +0000 (16:12 +0000)]
Merge "Deprecate Activity#requestVisibleBehind" into oc-dev
am:
e4b6441198
Change-Id: Ib18fa326c6f41b8f83cd9d08043acd2b80324db1
Android Build Merger (Role) [Thu, 20 Apr 2017 16:11:12 +0000 (16:11 +0000)]
Merge "Merge "Listen to USER_STARTED instead of USER_ADDED from WebViewUpdateService." into oc-dev am:
61f57e7435" into oc-dev-plus-aosp
Gustav Sennton [Thu, 20 Apr 2017 16:10:30 +0000 (16:10 +0000)]
Merge "Listen to USER_STARTED instead of USER_ADDED from WebViewUpdateService." into oc-dev
am:
61f57e7435
Change-Id: Ia8041d566e59931ffa6fe9eacbfaabb2c63a4a13
Android Build Merger (Role) [Thu, 20 Apr 2017 16:10:06 +0000 (16:10 +0000)]
Merge "Merge changes from topics 'smartselectconfig', 'langidconfig' into oc-dev am:
06a53d4729" into oc-dev-plus-aosp
Abodunrinwa Toki [Thu, 20 Apr 2017 16:08:24 +0000 (16:08 +0000)]
Merge changes from topics 'smartselectconfig', 'langidconfig' into oc-dev
am:
06a53d4729
Change-Id: Ia739bdad9c5877f9e02efba709521fb9c9dc8795
Android Build Merger (Role) [Thu, 20 Apr 2017 16:07:52 +0000 (16:07 +0000)]
Merge "Merge "AutoSize TextView - API polish - no RuntimeException in signature" into oc-dev am:
635d9dd864" into oc-dev-plus-aosp
Andrei Stingaceanu [Thu, 20 Apr 2017 16:07:03 +0000 (16:07 +0000)]
Merge "AutoSize TextView - API polish - no RuntimeException in signature" into oc-dev
am:
635d9dd864
Change-Id: Ic11450a566051ca63f3b65e60c70e8da4d1cef11
Android Build Merger (Role) [Thu, 20 Apr 2017 16:06:34 +0000 (16:06 +0000)]
Merge "Merge "TRON: Log "textAssist" actions." into oc-dev am:
fa9d889d3e" into oc-dev-plus-aosp
Abodunrinwa Toki [Thu, 20 Apr 2017 16:05:43 +0000 (16:05 +0000)]
Merge "TRON: Log "textAssist" actions." into oc-dev
am:
fa9d889d3e
Change-Id: I068828dfb979dec12f30b7b0d01464d0bb895691
Android Build Merger (Role) [Thu, 20 Apr 2017 16:05:00 +0000 (16:05 +0000)]
Merge "Merge "Add shell command for turning on/off WebView multiprocess." into oc-dev am:
96d27d826f" into oc-dev-plus-aosp
Gustav Sennton [Thu, 20 Apr 2017 16:03:16 +0000 (16:03 +0000)]
Merge "Add shell command for turning on/off WebView multiprocess." into oc-dev
am:
96d27d826f
Change-Id: Ibd0cef2732f1c61a63d8dfd5c23454e123667cb2
Android Build Merger (Role) [Thu, 20 Apr 2017 16:03:00 +0000 (16:03 +0000)]
Merge "Merge "Switch to WifiManager.{start,stop}SoftAp()" am:
275edcb940 am:
11fdd1769b am:
7d321645a2" into oc-dev-plus-aosp
TreeHugger Robot [Thu, 20 Apr 2017 16:02:46 +0000 (16:02 +0000)]
Merge "Fix QS label layout" into oc-dev
Erik Kline [Thu, 20 Apr 2017 16:02:06 +0000 (16:02 +0000)]
Merge "Switch to WifiManager.{start,stop}SoftAp()" am:
275edcb940 am:
11fdd1769b
am:
7d321645a2
Change-Id: I40e72d9b8f99c52089a8c73c8ca20d1efd10c68d
Clara Bayarri [Thu, 20 Apr 2017 16:01:03 +0000 (16:01 +0000)]
Merge "Api Council: hide FontsContract.Columns constructor" into oc-dev
am:
1ef45a8bed
Change-Id: Ife03fa12b508a54465a3b57f9b97ed1bb0a6c059
TreeHugger Robot [Thu, 20 Apr 2017 15:59:40 +0000 (15:59 +0000)]
Merge "Fix alpha on wifi disconnected icon" into oc-dev
Erik Kline [Thu, 20 Apr 2017 15:54:32 +0000 (15:54 +0000)]
Merge "Switch to WifiManager.{start,stop}SoftAp()" am:
275edcb940
am:
11fdd1769b
Change-Id: If43782074b323a7e2da4315ca342a3706d510959
TreeHugger Robot [Thu, 20 Apr 2017 15:50:41 +0000 (15:50 +0000)]
Merge "Fix alpha on wifi connected 4 bars no inet icon" into oc-dev
Erik Kline [Thu, 20 Apr 2017 15:50:19 +0000 (15:50 +0000)]
Merge "Switch to WifiManager.{start,stop}SoftAp()"
am:
275edcb940
Change-Id: I697bf530da9786da4ed1405ac8b44b7bc4d097a6
Jean-Michel Trivi [Thu, 20 Apr 2017 15:45:06 +0000 (15:45 +0000)]
Merge "Revert "Revert "AudioAttributes: remove static getVolumeControlStream method""" into oc-dev
Treehugger Robot [Thu, 20 Apr 2017 15:37:29 +0000 (15:37 +0000)]
Merge "Switch to WifiManager.{start,stop}SoftAp()"
Martijn Coenen [Thu, 20 Apr 2017 15:33:28 +0000 (15:33 +0000)]
Merge "Stop hwbinder threads from app_process." into oc-dev
Wenting Xiong [Tue, 7 Feb 2017 11:12:27 +0000 (19:12 +0800)]
DO NOT MERGE. SystemUI: Display RAT icon when data is off
Introduce customization and implementation to display RAT icon in status
bar even when data is off. Since some carriers require, this feature is
necessary.
Test: Test with simulated RIL
Bug:
28805511
Change-Id: I412a407b8bcfeb9b3caf265bc7e0331a88433725
Philipp Weiß [Thu, 20 Apr 2017 15:28:24 +0000 (15:28 +0000)]
Merge "Redesign QSSecurityFooter dialog" into oc-dev
Philipp Weiß [Thu, 20 Apr 2017 15:26:55 +0000 (15:26 +0000)]
Merge "String fixes in QSFooter" into oc-dev
Jason Monk [Thu, 20 Apr 2017 15:26:36 +0000 (11:26 -0400)]
Fix status bar not hiding quickly
Appears to be from the delay of posting in the CommandQueue, skip
post when possible.
Test: Turn screen off the right back on.
Change-Id: I285b45544f32891ab86fd1f4a4aba3204bcbfdb4
Fixes:
36463611
Stephen Kiazyk [Tue, 4 Apr 2017 21:46:59 +0000 (14:46 -0700)]
Remove swipe to exit persistent Vr mode behavior
This behavior is somewhat redundant now
* It is currently already possible to exit Vr mode in normal
circumstances by pressing the X in the top left of the screen.
* If a 'safety hatch' is needed, one can just press the power button,
which will require going through the Don flow again, which can then be
cancelled by pressing the X button.
As it is, the swipe behavior is likely just to cause confusion (and
currently, it puts the device in a bad state where the vr app is still
running, but the screen is blank except for the overlay). My proposition
is just to remove it and use the power button as the safe/guaranteed way
to exit vr mode.
Bug:
36965697
Test: Swiping no longer drops the screen to the overlay when in a
vrflinger application.
Change-Id: I461828f5dce67361a5f4d60c47ac7d6371a4efb3
Jason Monk [Wed, 19 Apr 2017 22:41:06 +0000 (18:41 -0400)]
Add go to web action for instant apps
Test: manual
Change-Id: I8953967ac849f5a5d4129c514172238e17d54df7
Fixes:
35873804
Jason Monk [Wed, 19 Apr 2017 21:13:41 +0000 (17:13 -0400)]
Fix when instant app notif is showing
Test: manual
Change-Id: If17eddad60f8207fecf9518430a280261bde5b30
Fixes:
37107497
TreeHugger Robot [Thu, 20 Apr 2017 14:56:20 +0000 (14:56 +0000)]
Merge "Do not check user escrow state if synthetic password is not enabled yet" into oc-dev
Phil Weaver [Thu, 20 Apr 2017 14:51:37 +0000 (14:51 +0000)]
Merge "Make a11y clickable span work after node recycle" into oc-dev
Jesse Hall [Thu, 20 Apr 2017 14:51:33 +0000 (14:51 +0000)]
Merge "Vulkan compute 0 only requires variable pointers" into oc-dev
Bryce Lee [Thu, 20 Apr 2017 14:19:13 +0000 (14:19 +0000)]
Merge "Deprecate Activity#requestVisibleBehind" into oc-dev
Bryce Lee [Wed, 19 Apr 2017 17:40:42 +0000 (10:40 -0700)]
Do not pause resumed activity in resumeTopActivityUncheckedLocked.
A number of operations occur between setting the resumed activity and
notifying the activity to resume. One of these steps is updating the
configuration, which can cause the device to pause the resumed
activity. Since the activity has not been told to resume, this leads
to a pause before resume.
This changelist addresses the issue by checking whether we are in the
middle of resuming the top activity before attempting to stop the
currently set resumed activity.
Change-Id: I3b5b61de6b1b5a35b7773912b4e63d6c69096c04
Fixes:
35637717
Test: bit FrameworksServicesTests:com.android.server.am.ActivityStackTests#testNoPauseDuringResumeTopActivity
Erik Kline [Thu, 20 Apr 2017 14:02:24 +0000 (14:02 +0000)]
Merge "Add local-only hotspot info into tether state change broadcast" am:
4c7a999d79 am:
6af3dd0fc3
am:
3fa8908370
Change-Id: If3851c3f15314e3c0d357e154049aaa2b8b5c8e7
Hugo Benichi [Thu, 20 Apr 2017 13:59:32 +0000 (13:59 +0000)]
Merge "ConnectivityManager: remove obsolete callback types" am:
458f75ef69 am:
23ee1621c7
am:
b51307e12e
Change-Id: I2f5fad0b559b972e82ecacdfcdd3805f0fbb2655
Gustav Sennton [Thu, 20 Apr 2017 13:56:59 +0000 (13:56 +0000)]
Merge "Listen to USER_STARTED instead of USER_ADDED from WebViewUpdateService." into oc-dev
Erik Kline [Thu, 20 Apr 2017 13:52:35 +0000 (13:52 +0000)]
Merge "Make tetherChangePermission to be secured for AppOps permission" am:
fe86a197a1 am:
0d1f04384f
am:
d9bfb83d96
Change-Id: I6dd418684b1a40292cd496ead3613cf938577c09
Abodunrinwa Toki [Thu, 20 Apr 2017 13:30:30 +0000 (13:30 +0000)]
Merge changes from topics 'smartselectconfig', 'langidconfig' into oc-dev
* changes:
SmartSelection Config installer.
LangId Config installer.
Hugo Benichi [Thu, 20 Apr 2017 13:26:36 +0000 (22:26 +0900)]
resolve merge conflicts of
7bbd03be361f to oc-dev-plus-aosp
Conflits were:
- static import section of ConnectivityService
- code deleted in commit
a0385686769c077a163768f1eb3f8df10e30ccd9
Test: built.
Change-Id: I0e026522558f39d8ae6812b62a30f2501923ab86
OSDN Git Service
