OSDN Git Service
Jorim Jaggi [Mon, 22 Aug 2016 20:08:44 +0000 (13:08 -0700)]
Add animation when unoccluding windows (1/2)
Before there was a jump-cut when a window that was occluding Keyguard
was going away, leading to an ugly flicker. To fix this, we do the
following.
- Always show windows with FLAG_SHOW_WHEN_LOCKED above lockscreen, even
if they don't "match" the currently occluding app (which is null in the
animation case)
- Move wallpaper behind last window that is not hidden by policy, so the
window doesn't get occluded by the wallpaper.
- Add a flag in the setOccluded call whether to animate or not. SystemUI
then plays a nice animation when it's set.
- Override the animation to always be the animation that happens when we
exit a window which is revealing the wallpaper behind, to make it
consistent with the home screen case.
Fixes:
30829255
Change-Id: Ib3fe20fc9003a0f9f291c974740f044ed8707e75
TreeHugger Robot [Mon, 29 Aug 2016 19:51:29 +0000 (19:51 +0000)]
Merge "Fix flicker while booting" into nyc-mr1-dev
Tao Bao [Mon, 29 Aug 2016 19:48:29 +0000 (19:48 +0000)]
Bump up the uncrypt timeout to 30 min. am:
8abcfed8a4 am:
c5a17fc39f
am:
18f9533910
Change-Id: Ia41c67b41b9b89ac113f01e783edcbccae5a1cdc
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 19:01:16 +0000 (19:01 +0000)]
Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev am:
128a4419e9
am:
934da4e400
Change-Id: I9b8c06e89ce182b4fb47a74aaea3d501267add84
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:51:53 +0000 (18:51 +0000)]
DO NOT MERGE -- Correctly finish activity in non-focused stack am:
620040db3f -s ours
am:
febd5c027c
Change-Id: I658d45b3149128876240e41bbd16ad35951c6dfa
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
Jason Monk [Mon, 29 Aug 2016 18:32:39 +0000 (18:32 +0000)]
Merge "Fix double status bar icons" into nyc-dev am:
2b4e612b10
am:
db2d30e1b9
Change-Id: I707e1f8457e826d2d5b83ccc21668e5a786b28eb
Jason Monk [Mon, 29 Aug 2016 18:32:37 +0000 (18:32 +0000)]
Fix double status bar icons am:
12124d7eca
am:
447991c67a
Change-Id: Ic0a217f292dcf4a7d9b2b47c4d32438b436a77ad
Selim Cinek [Mon, 29 Aug 2016 18:32:35 +0000 (18:32 +0000)]
Merge "Fixed a bug where notifications could reappear" into nyc-dev am:
4226dcef1e
am:
c9c0bcf6a9
Change-Id: Ib517c495cd53a5ea0f14bb443b74d69d2efe8429
Selim Cinek [Mon, 29 Aug 2016 18:32:33 +0000 (18:32 +0000)]
Fixed a bug where notifications could reappear am:
f3b64692a3
am:
e90d6d682e
Change-Id: Ie08bd37033cd81ff0898a6766bd505e0f597d7fe
Selim Cinek [Mon, 29 Aug 2016 18:32:31 +0000 (18:32 +0000)]
Fixed a bug where the headsup would be stuck disappearing am:
a4155bb7c0
am:
c52edb4f24
Change-Id: I94084878dec7952607572d3005a160cc74eb2a62
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
Vineeta Srivastava [Mon, 29 Aug 2016 18:26:02 +0000 (18:26 +0000)]
Merge "whitelist sms code for TMO-DE and TMO-MK." into nyc-dr1-dev
am:
24b0486cdc
Change-Id: Id291ae046845660231be5b42473ef9b839055035
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
Vineeta Srivastava [Mon, 29 Aug 2016 18:26:00 +0000 (18:26 +0000)]
whitelist sms code for TMO-DE and TMO-MK.
am:
6af315af94
Change-Id: Ib31807ae28fa798e6d359054d70f9adeaf2872a4
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
Greg Kaiser [Mon, 29 Aug 2016 17:48:45 +0000 (17:48 +0000)]
Merge "ContextHubService: Allow cancelling load/unload" into nyc-mr1-dev
Greg Kaiser [Mon, 29 Aug 2016 17:43:29 +0000 (17:43 +0000)]
Merge "ContextHubService: Hack in Google vendor value" into nyc-mr1-dev
Amith Yamasani [Mon, 29 Aug 2016 17:42:37 +0000 (17:42 +0000)]
Merge "Add logging to CursorWindow JNI code to track #
31046363" into nyc-mr1-dev
Pablo Ceballos [Mon, 29 Aug 2016 17:41:57 +0000 (17:41 +0000)]
Merge "Fail createVirtualDisplay with single-buffered Surface" into nyc-mr1-dev
Greg Kaiser [Fri, 26 Aug 2016 06:04:08 +0000 (23:04 -0700)]
ContextHubService: Allow cancelling load/unload
As a minimal risk improvement for Android N, we allow a new
load/unload transaction request to cancel a currently pending
one if enough time has passed since starting the current
transaction.
Bug:
30111539
Change-Id: Ide958c2454b88529305443fb789b8ae5af18c642
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)
Narayan Kamath [Mon, 29 Aug 2016 11:31:41 +0000 (12:31 +0100)]
Fix clang build breakage (-Werror -Wformat).
Use %zd for size_t. Note that this will break only on (-plus-)aosp because
clang is disabled on the N development branches.
bug:
30963384
Change-Id: I4b5ba7caf15bc2ebf5bb3395d82170ec786ed50c
Narayan Kamath [Fri, 19 Aug 2016 12:45:24 +0000 (13:45 +0100)]
Reopen whitelisted zygote file descriptors after a fork.
We don't want these descriptors to be shared post-fork, so we'll
have to close and reopen them when the zygote forks. The set of
open descriptors is checked against a whitelist and it is a fatal
error if a non whitelisted FD is opened. It is also a fatal error
if anything other than a regular file / character device or socket
is opened at the time of forking.
This work is done in two stages :
- An initial list of FDs is constructed and cached prior to the
first zygote fork.
- On each subsequent fork, we check whether the list of open FDs
has changed. We are currently tolerant of changes, but in the
longer term, it should be a fatal error if the set of open file
descriptors in the zygote changes.
- Post fork, we traverse the list of open descriptors and reopen
them if necessary.
bug:
30963384
Change-Id: Icfd45c96c660491b554d146a9d70d97dbcc712bc
Felipe Leme [Sun, 28 Aug 2016 22:27:12 +0000 (22:27 +0000)]
Removed screen on/off callbacks from NPMS.
am:
b79f06a476
Change-Id: If17367db296e3f8c90dddd9dce445a7068320a14
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
TreeHugger Robot [Sat, 27 Aug 2016 01:37:06 +0000 (01:37 +0000)]
Merge "Fix invalid divider state while rotating" into nyc-mr1-dev
Daniel Chapin [Sat, 27 Aug 2016 01:19:31 +0000 (01:19 +0000)]
Merge "Fixes for ImageView drawable visibility dispatch" into nyc-dr1-dev
am:
7c02d7adaa
Change-Id: Iea12e62f45fb097507282d461be69d1dd83fd5a0
Adam Powell [Sat, 27 Aug 2016 01:19:28 +0000 (01:19 +0000)]
Fixes for ImageView drawable visibility dispatch
am:
06f9eb8b62
Change-Id: I8b7d8c73f0a718963a191fd5460517e5a7445974
Daniel Chapin [Sat, 27 Aug 2016 01:14:33 +0000 (01:14 +0000)]
Merge "Fixes for ImageView drawable visibility dispatch" into nyc-dr1-dev
Jorim Jaggi [Sat, 27 Aug 2016 00:46:52 +0000 (17:46 -0700)]
Fix flicker while booting
There was a short period of time where KeyguardScrim already went
away but status bar wasn't drawn yet, so we didn't consider it as
a wallpaper target so the wallpaper was invisible for a couple of
frames. Now only remove the scrim after the status bar has fully
drawn.
Change-Id: Ibf23b9e1277b6ce06e4ce70c9b7a5db9cbefce00
Fixes:
29643498
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
Jorim Jaggi [Thu, 25 Aug 2016 22:57:41 +0000 (15:57 -0700)]
Fix invalid divider state while rotating
- Sometimes there is no window attached to the app token during a
rotation. In this case, we also want to return a valid dock side, so
we check for hiddenRequested instead of traversing the windows
of an app window token.
- The logic to notify SystemUI about rotation changes never really
worked. Remove the dock side check as the dock side is guaranteed
to change if we change the screen rotation
- Also clean up visibility methods a bit.
Test: Manually tested the interaction when in docked state landscape,
and going home with locked home rotation like 20 times. Also tested
multi-user interaction with docking.
Change-Id: Ibcd181cadc9bc5a97dbd20e67d15bb1c88de5b97
Fixes:
29569499
Chong Zhang [Fri, 26 Aug 2016 23:28:22 +0000 (23:28 +0000)]
Merge "DO NOT MERGE -- Only use saved surface if started by launcher or moved to front" into nyc-dr1-dev
am:
19628b251d
Change-Id: Iac98c996ba13b59319a12b089be234366a8e7213
Chong Zhang [Fri, 26 Aug 2016 23:28:17 +0000 (23:28 +0000)]
DO NOT MERGE -- Only use saved surface if started by launcher or moved to front
am:
813be138ae
Change-Id: Id64071882a0b90212b92234a4d0bdc67f2ee5e1a
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
Amith Yamasani [Fri, 26 Aug 2016 16:22:36 +0000 (09:22 -0700)]
Add logging to CursorWindow JNI code to track #
31046363
Log the error messages when trying to mmap the remote
cursor's ashmem file descriptor.
Bug:
31046363
Change-Id: I52839d1246f84a0a2d7b1e850933fcdf6056b884
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
Todd Kennedy [Thu, 21 Jul 2016 14:44:33 +0000 (07:44 -0700)]
Enable web action apps based on system setting
Bug:
28140107
Change-Id: I4cff49165be6432404b9a616ca35bee249daab2a
Tyler Gunn [Fri, 26 Aug 2016 20:28:33 +0000 (20:28 +0000)]
Merge "Add device config to determine when "allow hold" carrier config is used." into nyc-mr1-dev
TreeHugger Robot [Fri, 26 Aug 2016 20:28:02 +0000 (20:28 +0000)]
Merge "Implement new ephemeral resolver design" into nyc-mr1-dev
Tyler Gunn [Wed, 3 Aug 2016 17:53:52 +0000 (10:53 -0700)]
Add device config to determine when "allow hold" carrier config is used.
The "allow hold" carrier config option was added to meet new carrier
requirements. However we do not wish to enforce this option on older
devices.
Bug:
30449352
Change-Id: I4bf6dab0a200bdd2511c67b8134c6c0dc4b7e5a8
Jorim Jaggi [Fri, 26 Aug 2016 01:14:14 +0000 (18:14 -0700)]
Play sound on ACTION_DOWN for navigation keys
Change-Id: I83a39aa9ba2519952cb723d72c66203881c9b3b5
Fixes:
30837708
Brian Duddie [Fri, 26 Aug 2016 18:20:17 +0000 (18:20 +0000)]
Merge "ContextHubManager: Document InstanceInfo bug" into nyc-mr1-dev
TreeHugger Robot [Fri, 26 Aug 2016 17:50:18 +0000 (17:50 +0000)]
Merge "Document correct context for obtaining WifiManager" into nyc-mr1-dev
Allen Hair [Fri, 26 Aug 2016 17:28:50 +0000 (17:28 +0000)]
Merge "Configure code coverage filters." into nyc-mr1-dev
Fyodor Kupolov [Fri, 26 Aug 2016 16:52:02 +0000 (16:52 +0000)]
Merge "Fix AccountManagerServiceTest" into nyc-mr1-dev
Dirk Dougherty [Fri, 26 Aug 2016 16:31:29 +0000 (16:31 +0000)]
Merge "Fetch ga script over https to avoid mixed content." into nyc-dev am:
c2b9d55818
am:
61f52fca96
Change-Id: I2b3b941677aa5568c26cfb17161cc72b09f3fafe
Dirk Dougherty [Fri, 26 Aug 2016 16:31:26 +0000 (16:31 +0000)]
Fetch ga script over https to avoid mixed content. am:
b5760c1fe7
am:
324054e7d4
Change-Id: I245edf657d289265027eee94b9e40395da8ffa9e
Paul Stewart [Mon, 8 Aug 2016 17:20:13 +0000 (10:20 -0700)]
Document correct context for obtaining WifiManager
Added comments to both WifiManager WIFI_SERVICE.
Bug:
25015174
Change-Id: Ibd1e21d860ef2b7cc432b3da76671d22c02ef7cb
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
Brian Duddie [Fri, 26 Aug 2016 16:15:56 +0000 (16:15 +0000)]
Merge "ContextHub: Avoid reference leaks" into nyc-mr1-dev
Jason Monk [Fri, 26 Aug 2016 13:24:17 +0000 (13:24 +0000)]
Merge "Backup system QS tiles" into nyc-dr1-dev
am:
f498d0d384
Change-Id: I3df026ae22d4579c40e2c6532311ad69a3ceb0b7
Jason Monk [Fri, 26 Aug 2016 13:24:14 +0000 (13:24 +0000)]
Backup system QS tiles
am:
baade7573f
Change-Id: Ie601a706cbdcfdb1e836117d02fec914b4acbab1
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
Greg Kaiser [Fri, 26 Aug 2016 05:06:08 +0000 (22:06 -0700)]
ContextHubService: Hack in Google vendor value
To workaround b/
30808791 without changing the NanoApp API,
we make the assumption that if the most significant byte
of our four-byte app ID is a lower-case 'L', then this
is a Google Nanoapp and thus we should use "Googl" for
our vendor ID, and set the most significant four bytes
of our eight byte app ID accordingly.
Bug:
30922112
Change-Id: I155dff58cdda1ef36a68e6d25df1e9059b1252f1
Greg Kaiser [Wed, 17 Aug 2016 23:27:26 +0000 (16:27 -0700)]
ContextHubService: Avoid uninitialized handle
We avoid ever using uninitialized stack for the value of a handle
which we pass up to the Java layer.
In cleaning up this code a little, we make more explicit a failure
case which already existed: The Context Hub properly loading a
nanoapp, but our Service code failing to set up the infrastructure
to track it. We chose to tell the Java layer we failed in this
case, and more importantly, provide a consistent handle value.
Note that the INVALID_APP_ID is not known by the Java layer, but
it is consistent so future Java code could react to it. At
the very least we will now always have consistent behavior when
this situation happens.
Bug:
30795236
Change-Id: Id4eada529aa1b223867a47985ef1d5c1ba346ea3
Greg Kaiser [Fri, 26 Aug 2016 03:34:36 +0000 (03:34 +0000)]
Merge "NanoAppFilter: Workaround HubId issues" into nyc-mr1-dev
Greg Kaiser [Fri, 26 Aug 2016 03:34:04 +0000 (03:34 +0000)]
Merge "ContextHubService: Maintain hub result meaning" into nyc-mr1-dev
Greg Kaiser [Fri, 26 Aug 2016 03:30:16 +0000 (03:30 +0000)]
Merge "ContextHubManager: Fix API documentation." into nyc-mr1-dev
Greg Kaiser [Fri, 26 Aug 2016 03:29:19 +0000 (03:29 +0000)]
Merge changes I896af608,I2e2a65bc,I8d9ae8b9,Ibb07666a into nyc-mr1-dev
* changes:
ContextHubService: Fix app query
ContextHubService: Don't double report app loads
ContextHubService: Make app handle size match Java
ContextHubService: Update caches on nanoapp unload
Erik Kline [Fri, 26 Aug 2016 01:40:56 +0000 (01:40 +0000)]
Merge "Add simple NetdService util class" into nyc-mr1-dev
Android Build Merger (Role) [Fri, 26 Aug 2016 01:05:07 +0000 (01:05 +0000)]
Merge "Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev am:
314d995ca1 am:
b3ab8337df" into nyc-mr1-dev
Android Build Merger (Role) [Fri, 26 Aug 2016 01:04:57 +0000 (01:04 +0000)]
Merge "docs: Fix typo and broken link in AsyncTask.java am:
53415ff24e am:
bae52ec98c" into nyc-mr1-dev
Winson Chung [Fri, 26 Aug 2016 01:04:48 +0000 (01:04 +0000)]
Merge "Fixing typo in dump log." into nyc-mr1-dev
Mark Lu [Fri, 26 Aug 2016 01:04:01 +0000 (01:04 +0000)]
Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev am:
314d995ca1
am:
b3ab8337df
Change-Id: I0dc06d19b3ec64fa6c3852f908d4cb21768ca34d
Mark Lu [Fri, 26 Aug 2016 01:03:59 +0000 (01:03 +0000)]
docs: Fix typo and broken link in AsyncTask.java am:
53415ff24e
am:
bae52ec98c
Change-Id: Idb695142488874d52dd406bede0fb4848f7663a9
Mark Lu [Fri, 26 Aug 2016 01:03:57 +0000 (01:03 +0000)]
Merge "docs: fix link in Loader reference page" into nyc-dev am:
3c638c1ea1
am:
ceaef72fb9
Change-Id: I182c0a0e1656308e4001f4f74751091023cae42d
Mark Lu [Fri, 26 Aug 2016 01:03:56 +0000 (01:03 +0000)]
docs: fix link in Loader reference page am:
9f52b7a4a8
am:
f496b9a981
Change-Id: I7a7ee695fadb2e0774ef84724a4320fc73b45a88
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
TreeHugger Robot [Fri, 26 Aug 2016 00:39:42 +0000 (00:39 +0000)]
Merge "Resolving race condition while writing recent taskids" into nyc-mr1-dev
Allen Hair [Thu, 25 Aug 2016 23:06:26 +0000 (16:06 -0700)]
Configure code coverage filters.
Bug:
28269038
Change-Id: If4dfb769d543e70faea7200dc1da15c50a83270f
Fyodor Kupolov [Thu, 25 Aug 2016 22:09:22 +0000 (15:09 -0700)]
Fix AccountManagerServiceTest
Unregister AccountManagerInternal before creating a new instance of
AccountManagerService, otherwise it will cause:
java.lang.IllegalStateException: Overriding service registration
Also overrode MockPm.addOnPermissionsChangeListener to be a noop and
not throw an exception.
Bug:
31071079
Change-Id: I0d24232eba655a68bf3fb38d7aa9edb92d469cea
Sudheer Shanka [Fri, 26 Aug 2016 00:10:15 +0000 (00:10 +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
am:
c3a6dbd46e
Change-Id: I1e5956843a2cd4ea5d25ed10a63f3164097fe1ca
Sudheer Shanka [Fri, 26 Aug 2016 00:06:01 +0000 (00:06 +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
am:
c18b88c15d
Change-Id: I67b766b5c658101cffc4ef53db67685709aec072
Sudheer Shanka [Fri, 26 Aug 2016 00:03:19 +0000 (00:03 +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
am:
2ea71d8c64
Change-Id: I66c2b69d13949c64390081ac7f8e868d6f025d95
Sudheer Shanka [Fri, 26 Aug 2016 00:03:15 +0000 (00:03 +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
am:
26fa4042e1
Change-Id: I12c0a05425d5cf141d328745a19d5e56db196456
Amith Yamasani [Fri, 26 Aug 2016 00:03:12 +0000 (00:03 +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
am:
d8ffc6239b
Change-Id: Ibcaa7f162284c8a18fc68202fc169284e37099e5