Vineeta Srivastava
24b0486cdc
Merge "whitelist sms code for TMO-DE and TMO-MK." into nyc-dr1-dev
2016-08-29 18:18:20 +00:00
Felipe Leme
b79f06a476
Removed screen on/off callbacks from NPMS.
...
NetworkPolicyManagerService (NPMS) used to depend on screen on/off
changes to determine if a foreground activity should have network
restrictions, but such check is now redundant since ActivityManager
already changes the proper UID state (like going from TOP to
TOP_SLEEPING) when the screen status is changed.
Removing such code decreases the NPMS lock contention when the screen is
turned on in about 3-5ms.
Change-Id: I2853443efedbf14961ae9a5b2e72689d4d1a646c
BUG: 30785671
(cherry picked from commit 88f40ad9a7f8dd7b4e8d
2016-08-28 02:24:42 +00:00
Daniel Chapin
7c02d7adaa
Merge "Fixes for ImageView drawable visibility dispatch" into nyc-dr1-dev
2016-08-27 01:14:34 +00:00
Chong Zhang
19628b251d
Merge "DO NOT MERGE -- Only use saved surface if started by launcher or moved to front" into nyc-dr1-dev
2016-08-26 23:22:10 +00:00
Adam Powell
06f9eb8b62
Fixes for ImageView drawable visibility dispatch
...
Some apps rely on their drawables not getting not-visible hints via
setVisible when the window visibility changes. This manifests as
additional animations, such as crossfading from placeholders when the
window becomes visible again.
Apps should be able to handle this case in the future now that we have
more detailed reporting via onVisibilityAggregated, but to keep
existing apps working as-is, ImageView now operates in a compatibility
mode for targetSdkVersion < N and will only dispatch visibility
signals based on the same triggers used in M. New apps get the more
detailed signals.
Fix a bug where window visibility dispatch via onVisibilityAggregated
would double-dispatch "not visible" when the window is transitioning
from GONE => INVISIBLE or INVISIBLE => GONE.
Make the growing set of compatibility check fields in ImageView
static, matching the pattern from View.
Bug 30216207
Change-Id: I88875260bf6aaa23687c7d51353de8d633383531
2016-08-26 22:59:39 +00:00
Chong Zhang
813be138ae
DO NOT MERGE -- Only use saved surface if started by launcher or moved to front
...
Restrict saved surface to launcher start (ACTION_MAIN&CATEGORY_
LAUNCHER), or there is no intent at all (eg. task being brought to
front). If the intent is something else, likely the app is going
to show some specific page or view, instead of what's left last time.
This solves problems like the launcher shortcuts on DeckClock,
each of them is a different intent and will show one specific
view regardless of last states. Another example is Chrome tab
opened directly by action VIEW to open some URL.
(Note that this doesn't solve the problem with Chrome homescreen
shortcuts, it will still start with saved surface (if Chrome
is already open). This is because the shortcut is a trampoline
activity that starts the real chrome tab activity, but when
the trampoline is started, the whole task is already brought
to front, and ChromeTab could become visible with the task
before we actually start it.)
bug: 31055479
bug: 27747315
Change-Id: Id3e61c61ef516b0edc1f174320f02661222f226b
(cherry picked from commit ad24f96def
2016-08-26 15:41:58 -07:00
Vineeta Srivastava
6af315af94
whitelist sms code for TMO-DE and TMO-MK.
...
For Germany (T-D) 73240 and 3011 is added to whitelist
For Macedonia (TMMK) 129005 and 122 added to whitelist
Bug: 30908153
Change-Id: I892a172994de62d90df313e9f7aaa17356092448
2016-08-26 21:17:08 +00:00
Dirk Dougherty
61f52fca96
Merge "Fetch ga script over https to avoid mixed content." into nyc-dev
...
am: c2b9d55818
2016-08-26 16:25:46 +00:00
Dirk Dougherty
324054e7d4
Fetch ga script over https to avoid mixed content.
...
am: b5760c1fe7
2016-08-26 16:25:43 +00:00
Dirk Dougherty
c2b9d55818
Merge "Fetch ga script over https to avoid mixed content." into nyc-dev
2016-08-26 16:22:08 +00:00
Jason Monk
f498d0d384
Merge "Backup system QS tiles" into nyc-dr1-dev
2016-08-26 13:18:54 +00:00
Jason Monk
baade7573f
Backup system QS tiles
...
Add QS tiles to the backup list. Non-system tiles will get removed
since they won't be installed when restore happens.
Change-Id: Iccf6e773384c45bd4d1f10c21aa8af356b3920d2
Bug: 28782938
2016-08-26 13:15:49 +00:00
Mark Lu
b3ab8337df
Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev
...
am: 314d995ca1
2016-08-26 00:54:02 +00:00
Mark Lu
bae52ec98c
docs: Fix typo and broken link in AsyncTask.java
...
am: 53415ff24e
2016-08-26 00:53:59 +00:00
Mark Lu
ceaef72fb9
Merge "docs: fix link in Loader reference page" into nyc-dev
...
am: 3c638c1ea1
2016-08-26 00:53:55 +00:00
Mark Lu
f496b9a981
docs: fix link in Loader reference page
...
am: 9f52b7a4a8
2016-08-26 00:53:53 +00:00
Mark Lu
314d995ca1
Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev
2016-08-26 00:46:05 +00:00
Mark Lu
3c638c1ea1
Merge "docs: fix link in Loader reference page" into nyc-dev
2016-08-26 00:46:02 +00:00
Sudheer Shanka
c3a6dbd46e
Merge "resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c am: 77dec89bb3 am: 203d1bee25 am: 7a46fac0cd" into nyc-dev
...
am: fea9feb30e
2016-08-25 23:58:24 +00:00
Sudheer Shanka
c18b88c15d
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c am: 77dec89bb3 am: 203d1bee25 am: 7a46fac0cd
...
am: d57565864b
2016-08-25 23:58:21 +00:00
Sudheer Shanka
2ea71d8c64
Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours am: 603a69ffb4 am: 97194798ab am: c35a9fed39 am: 71933abbdc -s ours" into nyc-dev
...
am: cca29c7284
2016-08-25 23:49:45 +00:00
Sudheer Shanka
26fa4042e1
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours am: 603a69ffb4 am: 97194798ab am: c35a9fed39 am: 71933abbdc -s ours
...
am: 02ba5ef875
2016-08-25 23:49:42 +00:00
Amith Yamasani
d8ffc6239b
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours am: 9080d4462e am: 75c7391a41 am: f6361752ca am: 7586e03e06 -s ours" into nyc-dev
...
am: 5f5403def8
2016-08-25 23:49:30 +00:00
Amith Yamasani
f7259775d8
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours am: 9080d4462e am: 75c7391a41 am: f6361752ca am: 7586e03e06 -s ours
...
am: 4a3caefd6c
2016-08-25 23:49:28 +00:00
Sudheer Shanka
12a668fde8
Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa am: bc5775c18b -s ours" into nyc-dev
...
am: 555fbf30d2
2016-08-25 23:49:16 +00:00
Sudheer Shanka
380d9b9486
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa am: bc5775c18b -s ours
...
am: 6a9490f850
2016-08-25 23:49:14 +00:00
Amith Yamasani
fda97bed8d
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38 am: a106b52180 -s ours" into nyc-dev
...
am: 4ee46e5b99
2016-08-25 23:49:03 +00:00
Amith Yamasani
b6813f24ae
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38 am: a106b52180 -s ours
...
am: b6cc1acb63
2016-08-25 23:49:01 +00:00
Mark Goldstein
e24079f5b2
Merge "docs: Fix typo" into nyc-dev
...
am: 8d660eebad
2016-08-25 23:48:49 +00:00
Mark Goldstein
b348093ec4
docs: Fix typo
...
am: 1c22ae296b
2016-08-25 23:48:46 +00:00
Android Build Merger (Role)
fea9feb30e
Merge "resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c am: 77dec89bb3 am: 203d1bee25 am: 7a46fac0cd" into nyc-dev
2016-08-25 23:41:50 +00:00
Android Build Merger (Role)
cca29c7284
Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours am: 603a69ffb4 am: 97194798ab am: c35a9fed39 am: 71933abbdc -s ours" into nyc-dev
2016-08-25 23:41:41 +00:00
Android Build Merger (Role)
5f5403def8
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours am: 9080d4462e am: 75c7391a41 am: f6361752ca am: 7586e03e06 -s ours" into nyc-dev
2016-08-25 23:41:32 +00:00
Android Build Merger (Role)
555fbf30d2
Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa am: bc5775c18b -s ours" into nyc-dev
2016-08-25 23:41:20 +00:00
Android Build Merger (Role)
4ee46e5b99
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38 am: a106b52180 -s ours" into nyc-dev
2016-08-25 23:41:08 +00:00
Mark Goldstein
8d660eebad
Merge "docs: Fix typo" into nyc-dev
2016-08-25 23:40:43 +00:00
Sudheer Shanka
d57565864b
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c am: 77dec89bb3 am: 203d1bee25
...
am: 7a46fac0cd
2016-08-25 23:39:59 +00:00
Sudheer Shanka
02ba5ef875
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours am: 603a69ffb4 am: 97194798ab am: c35a9fed39
...
am: 71933abbdc
2016-08-25 23:39:54 +00:00
Amith Yamasani
4a3caefd6c
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours am: 9080d4462e am: 75c7391a41 am: f6361752ca
...
am: 7586e03e06
2016-08-25 23:39:49 +00:00
Sudheer Shanka
6a9490f850
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa
...
am: bc5775c18b
2016-08-25 23:39:41 +00:00
Amith Yamasani
b6cc1acb63
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38
...
am: a106b52180
2016-08-25 23:39:37 +00:00
Narayan Kamath
22585d75f9
resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e am: a21569cd76 am: b0429bbad5
...
am: 1238ffcd2c
2016-08-25 23:35:41 +00:00
Sudheer Shanka
7a46fac0cd
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c am: 77dec89bb3
...
am: 203d1bee25
2016-08-25 23:30:05 +00:00
Sudheer Shanka
71933abbdc
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours am: 603a69ffb4 am: 97194798ab
...
am: c35a9fed39
2016-08-25 23:30:03 +00:00
Amith Yamasani
7586e03e06
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours am: 9080d4462e am: 75c7391a41
...
am: f6361752ca
2016-08-25 23:29:59 +00:00
Sudheer Shanka
bc5775c18b
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb am: 2490679d7e
...
am: 2f664374fa
2016-08-25 23:29:56 +00:00
Amith Yamasani
a106b52180
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d am: 1d513c845a
...
am: 5eed3c9c38
2016-08-25 23:29:52 +00:00
Narayan Kamath
1238ffcd2c
resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e am: a21569cd76
...
am: b0429bbad5
2016-08-25 23:29:29 +00:00
Sudheer Shanka
203d1bee25
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c
...
am: 77dec89bb3
2016-08-25 23:22:19 +00:00
Sudheer Shanka
c35a9fed39
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours am: 603a69ffb4
...
am: 97194798ab
2016-08-25 23:22:14 +00:00
