OSDN Git Service
Tao Bao [Mon, 29 Aug 2016 19:34:23 +0000 (19:34 +0000)]
Bump up the uncrypt timeout to 30 min. am:
8abcfed8a4
am:
c5a17fc39f
Change-Id: Ib637e1f00ddebbac5a3bea6ff31f08854a95b7ea
Tao Bao [Mon, 29 Aug 2016 19:26:43 +0000 (19:26 +0000)]
Bump up the uncrypt timeout to 30 min.
am:
8abcfed8a4
Change-Id: I35340614fe09f96f8c31cc53a99e366580294490
Andrii Kulian [Mon, 29 Aug 2016 18:51:55 +0000 (18:51 +0000)]
Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev
am:
128a4419e9
Change-Id: I6c28db82c53af5a68c3d875ecca920b9a1364b32
Andrii Kulian [Mon, 29 Aug 2016 18:44:11 +0000 (18:44 +0000)]
DO NOT MERGE -- Correctly finish activity in non-focused stack
am:
620040db3f -s ours
Change-Id: I62703cc7f62bf42967021ce8defa30669e096ec2
Andrii Kulian [Mon, 29 Aug 2016 18:30:06 +0000 (18:30 +0000)]
Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev
Jason Monk [Mon, 29 Aug 2016 18:26:00 +0000 (18:26 +0000)]
Merge "Fix double status bar icons" into nyc-dev
am:
2b4e612b10
Change-Id: Ib0d9e51d289215d96525b68d0432b959e9b58f2f
Jason Monk [Mon, 29 Aug 2016 18:25:57 +0000 (18:25 +0000)]
Fix double status bar icons
am:
12124d7eca
Change-Id: Ief00496f19d2e249129023a03cd9f53d76fa7bf8
Selim Cinek [Mon, 29 Aug 2016 18:25:54 +0000 (18:25 +0000)]
Merge "Fixed a bug where notifications could reappear" into nyc-dev
am:
4226dcef1e
Change-Id: I7c3c46bf360899387a0d2d33d4beb83a3b096aa0
Selim Cinek [Mon, 29 Aug 2016 18:25:51 +0000 (18:25 +0000)]
Fixed a bug where notifications could reappear
am:
f3b64692a3
Change-Id: I19719fc6112e82d9600b4196570f571f87291530
Selim Cinek [Mon, 29 Aug 2016 18:25:47 +0000 (18:25 +0000)]
Fixed a bug where the headsup would be stuck disappearing
am:
a4155bb7c0
Change-Id: Ic82cbac42cf17427ca5d6675a63d6f914a87f6cb
Vineeta Srivastava [Mon, 29 Aug 2016 18:18:13 +0000 (18:18 +0000)]
Merge "whitelist sms code for TMO-DE and TMO-MK." into nyc-dr1-dev
Jason Monk [Mon, 29 Aug 2016 18:00:00 +0000 (18:00 +0000)]
Merge "Fix double status bar icons" into nyc-dev
TreeHugger Robot [Mon, 29 Aug 2016 17:58:28 +0000 (17:58 +0000)]
Merge "Fixed a bug where notifications could reappear" into nyc-dev
Jason Monk [Tue, 26 Jul 2016 17:04:50 +0000 (13:04 -0400)]
Fix double status bar icons
Don't allow the status bar icon slot list to be changed because
it confuses the relationship between StatusBarIconList and
StatusBarIconController. Set it in the constructor to enforce
this.
Change-Id: Ieeea0a9efad88179d1cccc0e5702899333de2e72
Fixes:
28524184
(cherry picked from commit
c6fe61c59c5a3a6ae691256c9afdde3820e3dd9e)
Felipe Leme [Wed, 10 Aug 2016 20:00:32 +0000 (13:00 -0700)]
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
88f40ad9a721ee30708be82f66fb58c64f1d36b5)
(cherry picked from commit
f8dd7b4e8d548274c680644a2225951b97e94a4f)
Tao Bao [Sat, 27 Aug 2016 03:52:41 +0000 (20:52 -0700)]
Bump up the uncrypt timeout to 30 min.
Bug:
30490464
Change-Id: I9b65afb10134d79b2f5b5275a6d81065a04e91b9
Daniel Chapin [Sat, 27 Aug 2016 01:14:33 +0000 (01:14 +0000)]
Merge "Fixes for ImageView drawable visibility dispatch" into nyc-dr1-dev
Selim Cinek [Wed, 20 Jul 2016 20:46:49 +0000 (13:46 -0700)]
Fixed a bug where notifications could reappear
With sensitive notifications a user could get into
a situation where the groupsummary would not be cleared
because its dismissability was never updated and based
on the visibility of the veto button. This is now corrected.
This Cl also cleans up the veto button handling overall and
ensures that there's no stale state arond it.
Change-Id: Ic7df8d382146d7863ee551c1daa8ba5ed384c7b5
Fixes:
30056258
(cherry picked from commit
9e624e732aa5646c83d203587be9c2c4e94c9266)
Selim Cinek [Wed, 13 Jul 2016 21:34:56 +0000 (14:34 -0700)]
Fixed a bug where the headsup would be stuck disappearing
Change-Id: I56d6be69f6e59c1bec647e7e70e50a36b793f895
Fixes:
30120962
Chong Zhang [Fri, 26 Aug 2016 23:22:08 +0000 (23:22 +0000)]
Merge "DO NOT MERGE -- Only use saved surface if started by launcher or moved to front" into nyc-dr1-dev
Andrii Kulian [Thu, 21 Jul 2016 01:59:28 +0000 (18:59 -0700)]
DO NOT MERGE -- Correctly finish activity in non-focused stack
When activity is finished we first looked for next activity to
show in focused stack. If real next activity to show in place
of finishing one is in the same non-focused stack, we didn't
fully complete the dismissal process and activity was stuck in
FINISHING state.
This CL checks if we're trying to finish visible activity in
paused state and destroy it immediately if top running activity
is visible - same as we do for pinned activities.
Bug:
29458854
Change-Id: I0d5ceb2daa45c0628d89417c8456e132996bcea9
(cherry picked from commit
7318d63ba6dbb3042907d10d5369fcd5ac444d67)
Adam Powell [Thu, 25 Aug 2016 00:09:01 +0000 (17:09 -0700)]
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
Chong Zhang [Thu, 25 Aug 2016 19:12:33 +0000 (12:12 -0700)]
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
ad24f96def42016049de05220593aa049b136def)
Vineeta Srivastava [Fri, 26 Aug 2016 21:10:54 +0000 (14:10 -0700)]
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
Dirk Dougherty [Fri, 26 Aug 2016 16:25:46 +0000 (16:25 +0000)]
Merge "Fetch ga script over https to avoid mixed content." into nyc-dev
am:
c2b9d55818
Change-Id: I921f581b8d418cc43d3ad50feaec8ddf233af945
Dirk Dougherty [Fri, 26 Aug 2016 16:25:43 +0000 (16:25 +0000)]
Fetch ga script over https to avoid mixed content.
am:
b5760c1fe7
Change-Id: I9cd19eac7a89c2ab5b5f1fd11a98bcdc7b7850ab
Dirk Dougherty [Fri, 26 Aug 2016 16:22:05 +0000 (16:22 +0000)]
Merge "Fetch ga script over https to avoid mixed content." into nyc-dev
Jason Monk [Fri, 26 Aug 2016 13:18:52 +0000 (13:18 +0000)]
Merge "Backup system QS tiles" into nyc-dr1-dev
Jason Monk [Thu, 25 Aug 2016 19:57:14 +0000 (15:57 -0400)]
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
Mark Lu [Fri, 26 Aug 2016 00:54:02 +0000 (00:54 +0000)]
Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev
am:
314d995ca1
Change-Id: Idf4e30a184c086f360db24b2360cef758e2ea36d
Mark Lu [Fri, 26 Aug 2016 00:53:59 +0000 (00:53 +0000)]
docs: Fix typo and broken link in AsyncTask.java
am:
53415ff24e
Change-Id: I1fd10e79a2af2db5bc175dcc4126d3f88c35f4b1
Mark Lu [Fri, 26 Aug 2016 00:53:55 +0000 (00:53 +0000)]
Merge "docs: fix link in Loader reference page" into nyc-dev
am:
3c638c1ea1
Change-Id: I90e2cc4100d130299bfd7094fe727c405773f64e
Mark Lu [Fri, 26 Aug 2016 00:53:53 +0000 (00:53 +0000)]
docs: fix link in Loader reference page
am:
9f52b7a4a8
Change-Id: I32164f55f9b42dc50f13756c942644350a7d643e
Mark Lu [Fri, 26 Aug 2016 00:46:03 +0000 (00:46 +0000)]
Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev
Mark Lu [Fri, 26 Aug 2016 00:46:00 +0000 (00:46 +0000)]
Merge "docs: fix link in Loader reference page" into nyc-dev
Sudheer Shanka [Thu, 25 Aug 2016 23:58:24 +0000 (23:58 +0000)]
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
Change-Id: Iaca1bc4e5187f8faa716447dad72e21e480d8fb4
Sudheer Shanka [Thu, 25 Aug 2016 23:58:21 +0000 (23:58 +0000)]
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
Change-Id: Idc453e502aa7b88ded12979c51cb0fc623ab9eb3
Sudheer Shanka [Thu, 25 Aug 2016 23:49:45 +0000 (23:49 +0000)]
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
Change-Id: I61a488a73884cbb0e9bb2886858d8ffe92b6ae34
Sudheer Shanka [Thu, 25 Aug 2016 23:49:42 +0000 (23:49 +0000)]
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
Change-Id: Id1c710fc85ba3aa516645bb56b9ab744bdf5eb1e
Amith Yamasani [Thu, 25 Aug 2016 23:49:30 +0000 (23:49 +0000)]
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
Change-Id: Id8752560cdf0d732f96d5987a5fe2cc79883ac10
Amith Yamasani [Thu, 25 Aug 2016 23:49:28 +0000 (23:49 +0000)]
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
Change-Id: I46bfb961a022dc383510d9189b4de2dfa91dde9d
Sudheer Shanka [Thu, 25 Aug 2016 23:49:16 +0000 (23:49 +0000)]
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
Change-Id: I03d222633c7a276b889035faf900e2fa66f7289f
Sudheer Shanka [Thu, 25 Aug 2016 23:49:14 +0000 (23:49 +0000)]
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
Change-Id: I51c3762d21c30d091d33e79b83b4f09dfdf72d19
Amith Yamasani [Thu, 25 Aug 2016 23:49:03 +0000 (23:49 +0000)]
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
Change-Id: Ifb42c3e05317e63ed428e1f542a691dacfb187a8
Amith Yamasani [Thu, 25 Aug 2016 23:49:01 +0000 (23:49 +0000)]
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
Change-Id: I589b676604afc0e728d2aa7c7616f53698aec900
Mark Goldstein [Thu, 25 Aug 2016 23:48:49 +0000 (23:48 +0000)]
Merge "docs: Fix typo" into nyc-dev
am:
8d660eebad
Change-Id: I4df576fd0f070c4104ff83498eca20987c6a7b07
Mark Goldstein [Thu, 25 Aug 2016 23:48:46 +0000 (23:48 +0000)]
docs: Fix typo
am:
1c22ae296b
Change-Id: I9f7f4389583eedbae2df7554f974d49ebe4b9c1e
Android Build Merger (Role) [Thu, 25 Aug 2016 23:41:48 +0000 (23:41 +0000)]
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
Android Build Merger (Role) [Thu, 25 Aug 2016 23:41:39 +0000 (23:41 +0000)]
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
Android Build Merger (Role) [Thu, 25 Aug 2016 23:41:30 +0000 (23:41 +0000)]
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
Android Build Merger (Role) [Thu, 25 Aug 2016 23:41:16 +0000 (23:41 +0000)]
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
Android Build Merger (Role) [Thu, 25 Aug 2016 23:41:06 +0000 (23:41 +0000)]
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
Mark Goldstein [Thu, 25 Aug 2016 23:40:40 +0000 (23:40 +0000)]
Merge "docs: Fix typo" into nyc-dev
Sudheer Shanka [Thu, 25 Aug 2016 23:39:59 +0000 (23:39 +0000)]
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
Change-Id: Ib35ca340d72a71b8cd9ae6d850375012461977ad
Sudheer Shanka [Thu, 25 Aug 2016 23:39:54 +0000 (23:39 +0000)]
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
Change-Id: I5dbd13447fe89f0fa6040b9377098fda50335ca9
Amith Yamasani [Thu, 25 Aug 2016 23:39:49 +0000 (23:39 +0000)]
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
Change-Id: I404e1cdbb507d5c48c31cd3fddc3ff5f9e1078b5
Sudheer Shanka [Thu, 25 Aug 2016 23:39:41 +0000 (23:39 +0000)]
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
Change-Id: Iabe2db5b615a67130bffceca1801fd5ee9749ba0
Amith Yamasani [Thu, 25 Aug 2016 23:39:37 +0000 (23:39 +0000)]
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
Change-Id: Ia656bceb884d47015003d6c60f54f18f2217c01b
Narayan Kamath [Thu, 25 Aug 2016 23:35:41 +0000 (23:35 +0000)]
resolve merge conflicts of
5191225 to mnc-dev am:
1fbc4b8624 am:
8f4f9e4d5e am:
a21569cd76 am:
b0429bbad5
am:
1238ffcd2c
Change-Id: I4fa223dc0d1e1beeb6d9a8a7dfd1181efe473a90
Sudheer Shanka [Thu, 25 Aug 2016 23:30:05 +0000 (23:30 +0000)]
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
Change-Id: Ib8939aceb6c23ce3273eef396a9d8fa09aa4aeb8
Sudheer Shanka [Thu, 25 Aug 2016 23:30:03 +0000 (23:30 +0000)]
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
Change-Id: Icf80dd720b371aa3ee488f074b5c038607691b80
Amith Yamasani [Thu, 25 Aug 2016 23:29:59 +0000 (23:29 +0000)]
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
Change-Id: I09846a866cdfec673fd99d5c7574d31734335d85
Sudheer Shanka [Thu, 25 Aug 2016 23:29:56 +0000 (23:29 +0000)]
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
Change-Id: I08ec5c73b827a58274aaa3422bd5ca57eb67e402
Amith Yamasani [Thu, 25 Aug 2016 23:29:52 +0000 (23:29 +0000)]
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
Change-Id: I4470a56b330eb087ecd2f2662ad99fccbca917cf
Narayan Kamath [Thu, 25 Aug 2016 23:29:29 +0000 (23:29 +0000)]
resolve merge conflicts of
5191225 to mnc-dev am:
1fbc4b8624 am:
8f4f9e4d5e am:
a21569cd76
am:
b0429bbad5
Change-Id: I0212348400f48551e21902938c5b42c7edb0ea9c
Sudheer Shanka [Thu, 25 Aug 2016 23:22:19 +0000 (23:22 +0000)]
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
Change-Id: I1d755ef86b80f723c3fde59476e0018167fbf8b7
Sudheer Shanka [Thu, 25 Aug 2016 23:22:14 +0000 (23:22 +0000)]
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
Change-Id: If4a1716de3d54d6a08025665cdff51edc1b2f6da
Amith Yamasani [Thu, 25 Aug 2016 23:22:10 +0000 (23:22 +0000)]
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
Change-Id: I2646c10763640e6079e09e6fd53b9958b3aba2ea
Sudheer Shanka [Thu, 25 Aug 2016 23:22:04 +0000 (23:22 +0000)]
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
Change-Id: I59f3ace3a9c72a6d2fe1e1bd4cadec102a8c6254
Amith Yamasani [Thu, 25 Aug 2016 23:22:00 +0000 (23:22 +0000)]
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
Change-Id: If920208b052d41a80d3a0bf70af831313c9b9c06
Narayan Kamath [Thu, 25 Aug 2016 23:21:09 +0000 (23:21 +0000)]
resolve merge conflicts of
5191225 to mnc-dev am:
1fbc4b8624 am:
8f4f9e4d5e
am:
a21569cd76
Change-Id: I502200a2a204e576944033a58ccd4be272603d5e
Sudheer Shanka [Thu, 25 Aug 2016 23:14:09 +0000 (23:14 +0000)]
resolve merge conflicts of
270947f to klp-modular-dev am:
76c4b2a7b6 -s ours am:
bbbb514bc9 am:
6a50270944 am:
a0994c6d58 am:
cdf70ba0a3
am:
c2a760e68c
Change-Id: I2e5a3bb037921013e78b4270d843cebe239ac520
Sudheer Shanka [Thu, 25 Aug 2016 23:14:06 +0000 (23:14 +0000)]
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
Change-Id: Ie94c3c24a3b07c26c8b363358f4df1d7366d95a2
Amith Yamasani [Thu, 25 Aug 2016 23:14:04 +0000 (23:14 +0000)]
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
Change-Id: Idd437ad418ac2deaf08a9c0ac89cb518c216d8f1
Sudheer Shanka [Thu, 25 Aug 2016 23:14:01 +0000 (23:14 +0000)]
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
Change-Id: Ia473e706d7b50376fffb122e03e48bd947f47562
Amith Yamasani [Thu, 25 Aug 2016 23:13:58 +0000 (23:13 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
b02862c2cf am:
dd0be992c0 am:
117a383099 -s ours
am:
368ae62e9d
Change-Id: Icfafc6e9d56a97777db1c3d0e0feae3305f6707f
Narayan Kamath [Thu, 25 Aug 2016 23:13:51 +0000 (23:13 +0000)]
resolve merge conflicts of
5191225 to mnc-dev am:
1fbc4b8624
am:
8f4f9e4d5e
Change-Id: I2f470a15113ac14219dea82c3a9487ef96f3f2f4
Narayan Kamath [Thu, 25 Aug 2016 23:08:25 +0000 (23:08 +0000)]
resolve merge conflicts of
5191225 to mnc-dev
am:
1fbc4b8624
Change-Id: Id3aad329dd515a392cbeb2f0e03c2eb5aee5cf71
Sudheer Shanka [Thu, 25 Aug 2016 23:07:56 +0000 (23:07 +0000)]
resolve merge conflicts of
270947f to klp-modular-dev am:
76c4b2a7b6 -s ours am:
bbbb514bc9 am:
6a50270944 am:
a0994c6d58
am:
cdf70ba0a3
Change-Id: Ia7c597b1b96e65cce89396a6b509a796bb17bc2c
Sudheer Shanka [Thu, 25 Aug 2016 23:07:53 +0000 (23:07 +0000)]
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
Change-Id: Ia4a5952bc4fda5be8602708215ff1d72a5db297a
Amith Yamasani [Thu, 25 Aug 2016 23:07:51 +0000 (23:07 +0000)]
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
Change-Id: I40d855d0f87483a6a8733475b490ddf6ee582433
Sudheer Shanka [Thu, 25 Aug 2016 23:07:49 +0000 (23:07 +0000)]
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
Change-Id: Id2ddb640c8d041f13a78c5f07fb1749968618b61
Amith Yamasani [Thu, 25 Aug 2016 23:07:46 +0000 (23:07 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
b02862c2cf am:
dd0be992c0
am:
117a383099 -s ours
Change-Id: I8173ba5c3156a6294d672db63c4a310b0c880cfb
Pankaj Kanwar [Thu, 25 Aug 2016 22:34:20 +0000 (22:34 +0000)]
Merge "Show a toast when switching from wifi to Verizon cell data." into nyc-dr1-dev
Dianne Hackborn [Thu, 25 Aug 2016 21:55:03 +0000 (21:55 +0000)]
Merge "Try to mitigate issue #
31016187: system_server crash in ArraySet." into nyc-dev
am:
184edd6d93
Change-Id: If28d6368a58a6d113e13a0f5b1a4f43d4f4a3d2d
Dianne Hackborn [Thu, 25 Aug 2016 21:55:01 +0000 (21:55 +0000)]
Try to mitigate issue #
31016187: system_server crash in ArraySet.
am:
dd28b7b5f3
Change-Id: I5526e96aa56d3a845f4989f08d30fd07d7a1d70b
Mark Lu [Thu, 25 Aug 2016 21:54:56 +0000 (21:54 +0000)]
Merge "docs: rewrite one attribute description in R.attr" into nyc-dev
am:
30cba33a60
Change-Id: Ide4ff7c35d90dcb746b2f6f626d600fa97810801
Mark Lu [Thu, 25 Aug 2016 21:54:54 +0000 (21:54 +0000)]
docs: rewrite one attribute description in R.attr
am:
5dabf06ae5
Change-Id: Iecfe65ca227844627a7122a3a1e5ea6285a31c9a
Mark Lu [Thu, 25 Aug 2016 21:54:51 +0000 (21:54 +0000)]
Merge "docs: fix broken links in Activity reference" into nyc-dev
am:
d428a012ba
Change-Id: Ia79921169d3bf62b0994d663d763f70cda29fe22
Mark Lu [Thu, 25 Aug 2016 21:54:49 +0000 (21:54 +0000)]
docs: fix broken links in Activity reference
am:
fa43485910
Change-Id: I72cebe96e1ea0c1950ca316bc80c337bfdde9002
Mark Lu [Thu, 25 Aug 2016 21:54:44 +0000 (21:54 +0000)]
Merge "docs: fix code snippets in SQL Databases page" into nyc-dev
am:
209fb02f84
Change-Id: I805e68de97a5929586b1e2f3d7c4057e1f6f8c50
Mark Lu [Thu, 25 Aug 2016 21:54:42 +0000 (21:54 +0000)]
docs: fix code snippets in SQL Databases page
am:
95698f127a
Change-Id: Iebfe1b54c173dc78a11fd3aa3aca5024b7cbb74e
Dirk Dougherty [Thu, 25 Aug 2016 21:50:54 +0000 (14:50 -0700)]
Fetch ga script over https to avoid mixed content.
Change-Id: Ic8f3421c67464b941312d6854267adfdf499aa43
TreeHugger Robot [Thu, 25 Aug 2016 21:38:41 +0000 (21:38 +0000)]
Merge "Try to mitigate issue #
31016187: system_server crash in ArraySet." into nyc-dev
Hemal Patel [Thu, 25 Aug 2016 21:37:59 +0000 (21:37 +0000)]
Docs: Fixed the Bluetooth guide link am:
65813dff14
am:
a544221abd
Change-Id: I0cbd8fa416f4d0b00d7cb3c65eef9748439abe48
Andrew Solovay [Thu, 25 Aug 2016 21:37:57 +0000 (21:37 +0000)]
docs: Removing non-English /preview/ directories
am:
2d629c3e5b
Change-Id: I499a0148d7ece41b30f83baa34a0efc5c0ec1c82
Mark Lu [Thu, 25 Aug 2016 21:34:02 +0000 (21:34 +0000)]
Merge "docs: rewrite one attribute description in R.attr" into nyc-dev
Mark Lu [Thu, 25 Aug 2016 21:33:28 +0000 (21:33 +0000)]
Merge "docs: fix broken links in Activity reference" into nyc-dev
Mark Lu [Thu, 25 Aug 2016 21:33:24 +0000 (21:33 +0000)]
Merge "docs: fix code snippets in SQL Databases page" into nyc-dev
Hemal Patel [Thu, 25 Aug 2016 21:31:56 +0000 (21:31 +0000)]
Docs: Fixed the Bluetooth guide link
am:
65813dff14
Change-Id: I4502828940c4f2e33363e10728e97f484bc15651