OSDN Git Service
Hemal Patel [Mon, 20 Jun 2016 22:01:02 +0000 (22:01 +0000)]
Docs: Changed sample link under Related Samples am:
ab5de09e7e
am:
d5af0a1214
Change-Id: I70c520f7ee4141b3c7c193aef6e4559ea5b35cc9
Hemal Patel [Mon, 20 Jun 2016 21:53:54 +0000 (21:53 +0000)]
Docs: Changed sample link under Related Samples
am:
ab5de09e7e
Change-Id: Ic7423b2c59cb70ff8a13c8b67e51e5d6e572f278
Roozbeh Pournader [Mon, 20 Jun 2016 21:39:20 +0000 (21:39 +0000)]
Merge "Mark Serbian in Latin script as non-localized [DO NOT MERGE]" into nyc-dev
Hall Liu [Mon, 20 Jun 2016 21:31:36 +0000 (21:31 +0000)]
Merge \\\\"DO NOT MERGE Disable app pinning when emergency call button pressed\\\\" into mnc-dev am:
fc32ec1aef am:
aeba34533c am:
317d0cb169
am:
edace5e820 -s ours
Change-Id: Iab755e613521b81b0c8df57269e4c7752ae6011e
Hall Liu [Mon, 20 Jun 2016 21:28:09 +0000 (21:28 +0000)]
Merge \\\"DO NOT MERGE Disable app pinning when emergency call button pressed\\\" into mnc-dev am:
fc32ec1aef am:
aeba34533c
am:
317d0cb169
Change-Id: I9fb47597393f5b1267ec37a05cd9aa34eebebd23
Hall Liu [Mon, 20 Jun 2016 21:21:25 +0000 (21:21 +0000)]
Merge \\"DO NOT MERGE Disable app pinning when emergency call button pressed\\" into mnc-dev am:
fc32ec1aef
am:
aeba34533c
Change-Id: Id2da5c1dcf1477c5ee71e1ecb25ccfbc92aed7bc
Hall Liu [Mon, 20 Jun 2016 21:15:42 +0000 (21:15 +0000)]
Merge \"DO NOT MERGE Disable app pinning when emergency call button pressed\" into mnc-dev
am:
fc32ec1aef
Change-Id: I04ff0004a9112cfbe7e61b2fa6cb3fd4f037bbd0
TreeHugger Robot [Mon, 20 Jun 2016 21:11:04 +0000 (21:11 +0000)]
Merge "Revert "Don't re-launch activities while the device is sleeping"" into nyc-dev
Hall Liu [Mon, 20 Jun 2016 21:04:41 +0000 (21:04 +0000)]
Merge "DO NOT MERGE Disable app pinning when emergency call button pressed" into mnc-dev
TreeHugger Robot [Mon, 20 Jun 2016 20:45:03 +0000 (20:45 +0000)]
Merge "Make advanced storage option sticky..." into nyc-dev
Joe Fernandez [Mon, 20 Jun 2016 20:13:08 +0000 (20:13 +0000)]
Merge "docs: Narnia 2 advertising language update" into nyc-dev
TreeHugger Robot [Mon, 20 Jun 2016 19:49:44 +0000 (19:49 +0000)]
Merge "BatteryStats: record best estimated battery capacity" into nyc-dev
Selim Cinek [Mon, 20 Jun 2016 19:11:48 +0000 (19:11 +0000)]
Merge changes I29ce7659,I2d6310a2,Ic4b29409,I6c5c970f into nyc-dev
* changes:
Fixed a stackoverflow in notifications
Fixed a bug where a notification was incorrectly marked as removed
Fixed a potential issue where a notification could be empty
Fixed a bug where the expanded layout would flash
Steve McKay [Mon, 20 Jun 2016 18:46:56 +0000 (11:46 -0700)]
Make advanced storage option sticky...
...when used from one of the picker modes.
Bug:
29454465
Change-Id: I5f7db04a51023b59121289afd300a13ea071146d
TreeHugger Robot [Mon, 20 Jun 2016 18:38:45 +0000 (18:38 +0000)]
Merge "Fix NPE in reading package-usage.list file" into nyc-dev
Jason Monk [Mon, 20 Jun 2016 18:34:15 +0000 (18:34 +0000)]
Merge "QS: Don't disable hotspot animation when leaving airplane mode" into nyc-dev
Gustav Sennton [Mon, 20 Jun 2016 18:17:05 +0000 (18:17 +0000)]
Merge "Use newly fetched PackageInfo for loading WebView code." into nyc-dev
Wale Ogunwale [Mon, 20 Jun 2016 17:45:13 +0000 (10:45 -0700)]
Revert "Don't re-launch activities while the device is sleeping"
This reverts commit
0619545be9adca4458cb627c18c211faad6b6275.
Bug:
29497152
Bug:
28518380
Change-Id: I8684b731b1e9973ead7066dc650eff720f70ac91
Chong Zhang [Mon, 20 Jun 2016 18:02:48 +0000 (18:02 +0000)]
Merge "Make sure fontScale in configuration sent to app is equal to global" into nyc-dev
Adrian Roos [Mon, 20 Jun 2016 18:00:01 +0000 (18:00 +0000)]
Merge "SystemUI: Override notification app name" into nyc-dev
Adam Lesinski [Sat, 18 Jun 2016 00:30:01 +0000 (17:30 -0700)]
BatteryStats: record best estimated battery capacity
Using the coulomb counter, record the estimated max battery
capacity.
Bug:
28743761
Change-Id: I1270b062cf4a1e6fd69ea1da3de11a85a81b3663
Chong Zhang [Fri, 17 Jun 2016 23:24:21 +0000 (16:24 -0700)]
Make sure fontScale in configuration sent to app is equal to global
We don't want the default value 1.0 from empty config to be applied
as an override.
bug:
29367672
Change-Id: Ia9947c24fa9435ba5b208eb9bd05e0b07b574015
Chris Tate [Mon, 20 Jun 2016 17:19:50 +0000 (17:19 +0000)]
Merge "Let bmgr inspect the set of whitelisted transports" into nyc-dev
David Brazdil [Mon, 20 Jun 2016 13:06:42 +0000 (14:06 +0100)]
Fix NPE in reading package-usage.list file
A zero-length file is a valid package usage file of version 0 but
checking against the version 1 magic would throw a NPE.
Bug:
29491065
Change-Id: Ie54b1dd3218e4b1251c29db0c784a5ddf605394f
Jeff Davidson [Mon, 20 Jun 2016 16:56:13 +0000 (16:56 +0000)]
Merge "Fix runtime restart when using aggregated net observers." into nyc-dev
Jason Monk [Mon, 20 Jun 2016 16:39:38 +0000 (12:39 -0400)]
QS: Don't disable hotspot animation when leaving airplane mode
Change-Id: I80750e3c4d63e4d590b43e3ed595100e054e5b1e
Fixes:
29374561
Julia Reynolds [Mon, 20 Jun 2016 16:40:29 +0000 (16:40 +0000)]
Merge "Don't reference variables before they are assigned." into nyc-dev
Joe Fernandez [Mon, 20 Jun 2016 16:08:46 +0000 (09:08 -0700)]
docs: Narnia 2 advertising language update
b/
29009702
Change-Id: Icd060074413c53d6ad24e2919dc80be949a2260c
Narayan Kamath [Mon, 20 Jun 2016 15:19:29 +0000 (15:19 +0000)]
Merge "PackageManager: Don't fail app installs if dexopt fails." into nyc-dev
Robin Lee [Fri, 17 Jun 2016 11:54:21 +0000 (12:54 +0100)]
Remove @return from void API javadoc
Fix:
29500429
Change-Id: Ieddf211ad881e2e48bf593dcde6d262dd5be6c5c
(cherry picked from commit
b3d6b13ad5fffaad82da4c060ba1a064a445456a)
Julia Reynolds [Mon, 20 Jun 2016 13:39:37 +0000 (09:39 -0400)]
Don't reference variables before they are assigned.
Rare but technically possible.
Change-Id: I375cd1ac0bef5b6c7295618bef087554114c3cdd
Fixes:
29394773
Gustav Sennton [Fri, 17 Jun 2016 13:02:52 +0000 (14:02 +0100)]
Use newly fetched PackageInfo for loading WebView code.
During a time window between the point at which a webview package
becomes updated and the WebViewUpdateService receiving an intent
declaring this action the WebViewUpdateService APIs will return a
PackageInfo pointing to an old and possibly removed WebView package.
This means that any paths that PackageInfo is referring to could have
been removed.
Currently, we set WebViewFactory.sPackageInfo using one of these APIs
and we might thus try to use deleted paths to to load WebView. This can
cause crashes, so instead fetch a fresh PackageInfo and assign
WebViewFactory.sPackageInfo to that.
Also early-out in loadWebViewNativeLibraryFromPackage if the current
package version doesn't match that of the one fetched from the
WebViewUpdateService.
Bug:
29381682
Change-Id: I2713ce2338a4a96c5317dcdbb363b424513088d5
Jason Monk [Mon, 20 Jun 2016 13:26:02 +0000 (13:26 +0000)]
Merge "QS: Fix missing tiles" into nyc-dev
Narayan Kamath [Mon, 20 Jun 2016 12:33:50 +0000 (13:33 +0100)]
PackageManager: Don't fail app installs if dexopt fails.
bug:
29493857
Change-Id: I953de204319b943d9389bb4c787f859e169e8d21
Shreyas Basarge [Mon, 20 Jun 2016 09:17:20 +0000 (09:17 +0000)]
Merge "Fix for the missing sync bug" into nyc-dev
Chris Wren [Sat, 18 Jun 2016 19:28:16 +0000 (19:28 +0000)]
Merge "assume a generous prior in the rate estimator" into nyc-dev
Selim Cinek [Sat, 18 Jun 2016 04:01:32 +0000 (21:01 -0700)]
Fixed a stackoverflow in notifications
Change-Id: I29ce76593af81ad6e326d2e273fd872a4d9d4a89
Fixes:
29464060
Selim Cinek [Sat, 18 Jun 2016 03:04:16 +0000 (20:04 -0700)]
Fixed a bug where a notification was incorrectly marked as removed
When unauto-bundled, it could lead to serious bugs on the lockscreen
and the header not being restored.
Change-Id: I2d6310a2bcb2f3a60402db5f1e522954f8bd0389
Fixes:
29463339
TreeHugger Robot [Sat, 18 Jun 2016 02:07:04 +0000 (02:07 +0000)]
Merge "DO NOT MERGE Move SurfaceView offscreen if the app stops drawing it" into nyc-dev
TreeHugger Robot [Sat, 18 Jun 2016 02:00:59 +0000 (02:00 +0000)]
Merge "Avoid re-calculating vsync mid-frame" into nyc-dev
Selim Cinek [Sat, 18 Jun 2016 01:02:12 +0000 (18:02 -0700)]
Fixed a potential issue where a notification could be empty
Change-Id: Ic4b294092a47d30c469dfbd1eb6ab31208533b1c
Fixes:
29158425\10
Roozbeh Pournader [Sat, 18 Jun 2016 00:34:13 +0000 (17:34 -0700)]
Mark Serbian in Latin script as non-localized [DO NOT MERGE]
Serbian in Latin script is only partially localized in Android N. We
should not show it as localized in either Setup Wizard or Settings.
Bug:
29460424
Change-Id: I6829a89c49c1b5e8768b1527daa3aa9508deb491
TreeHugger Robot [Sat, 18 Jun 2016 00:30:26 +0000 (00:30 +0000)]
Merge "Fix a race in local settings caches" into nyc-dev
Andre Eisenbach [Sat, 18 Jun 2016 00:15:18 +0000 (00:15 +0000)]
Merge "Fix race with BT disable in BLE_ON_STATE" into nyc-dev
TreeHugger Robot [Fri, 17 Jun 2016 23:42:58 +0000 (23:42 +0000)]
Merge "Fix data race" into nyc-dev
Hemal Patel [Fri, 17 Jun 2016 23:29:47 +0000 (16:29 -0700)]
Docs: Changed sample link under Related Samples
Changed the Hello Compute sample link to point to Github Android Samples page
Bug:
28928053
Change-Id: I0673620f8beb03297b5dea0b50f4ddbd9d6e25db
Chris Tate [Fri, 17 Jun 2016 23:20:18 +0000 (23:20 +0000)]
Merge "Unspecified alarm worksource names are the rule, not the exception" into nyc-dev
Christopher Tate [Fri, 17 Jun 2016 23:09:31 +0000 (16:09 -0700)]
Unspecified alarm worksource names are the rule, not the exception
Bug
29443799
Change-Id: I6457a3680a26c900ed9c8e2ac2ab3f5fc4dfc007
Aurimas Liutikas [Fri, 17 Jun 2016 23:11:23 +0000 (23:11 +0000)]
Merge \\"Fix spelling error in Core App Quality docs.\\" into mnc-io-docs am:
3c8b96ad1f
am:
cd9cc200d8
Change-Id: I590329103ed52b33e01b90964fa2a142c9e6e133
Aurimas Liutikas [Fri, 17 Jun 2016 23:06:08 +0000 (23:06 +0000)]
Merge \"Fix spelling error in Core App Quality docs.\" into mnc-io-docs
am:
3c8b96ad1f
Change-Id: I78b545d5bf018f7c9fd94397365753c8120700fe
Adrian Roos [Fri, 17 Jun 2016 22:59:49 +0000 (15:59 -0700)]
SystemUI: Override notification app name
Overrides the notification app name for all SystemUI notifications.
Change-Id: Ic7676069aa03d5b83f0fbe0e8c3ad9820453118a
Fixes:
26517701
Aurimas Liutikas [Fri, 17 Jun 2016 22:57:01 +0000 (22:57 +0000)]
Merge "Fix spelling error in Core App Quality docs." into mnc-io-docs
Svetoslav Ganov [Fri, 17 Jun 2016 22:27:43 +0000 (15:27 -0700)]
Fix a race in local settings caches
We send a handle to the generation tracker along with the first accessed
setting but don't send the generation id of when the setting was
actually looked up. So by the time the client gets the setting with the
generation tracker from which to get and cache the last generation the
setting may have changed. We need to pass the generation id along with
the value and the generation tracker.
bug:
29458487
Change-Id: I0ac4955ba5b10b547f8fe653a7c28e048a4691eb
TreeHugger Robot [Fri, 17 Jun 2016 22:03:58 +0000 (22:03 +0000)]
Merge "Add pm operation to set user restrictions." into nyc-dev
Amith Yamasani [Fri, 17 Jun 2016 21:55:59 +0000 (21:55 +0000)]
Merge "Clean up ex-users in lock settings db" into nyc-dev
Svetoslav Ganov [Fri, 17 Jun 2016 21:51:33 +0000 (21:51 +0000)]
Merge "Don't dispatch Uris with appended user handle" into nyc-dev
Adrian Roos [Fri, 17 Jun 2016 21:28:27 +0000 (14:28 -0700)]
Fix data race
Fixes a race in BluetoothControllerImpl that could lead
to a ConcurrentModificationException, by moving the manipulation
of the callbacks array to the handler.
Change-Id: I7c3be74d239d4706f55357f54e539b7b6439e76d
Fixes:
29390132
Winson Chung [Fri, 17 Jun 2016 21:29:02 +0000 (21:29 +0000)]
Merge "Ensure that the tint is properly applied in docked mode." into nyc-dev
Calvin On [Thu, 16 Jun 2016 00:58:23 +0000 (17:58 -0700)]
Fix race with BT disable in BLE_ON_STATE
This will restart the BT stack when it detects a transition
into OFF state while the user enable flag (mEnable) is set.
Bug:
29363429
Change-Id: I9839119b34c4694ad92e96240c6989008b2f8d52
John Reck [Fri, 17 Jun 2016 19:57:12 +0000 (12:57 -0700)]
Avoid re-calculating vsync mid-frame
Fixes:
29072773
By using computeFrameTime AnimationContext would
potentially end up modifying the latest vsync if
a very-slow frame was received from the UI thread.
This could potentially desync animations that were
RT & UI thread 'synchronized', but more significantly
it would confuse the swap chain which tries to only
draw one frame per vsync causing unneccessary frame
drops.
Change-Id: Ibd2ec3157ce32fee1eec8d56837c45a35e622895
Dianne Hackborn [Fri, 17 Jun 2016 20:33:21 +0000 (20:33 +0000)]
Merge "Work on issue #
29328569: NPE in " com.google.android.configupdater"" into nyc-dev
John Reck [Thu, 16 Jun 2016 22:36:13 +0000 (15:36 -0700)]
DO NOT MERGE Move SurfaceView offscreen if the app stops drawing it
Bug:
29360411
Change-Id: Iefb9d7a9dafb34a2b4f79130a2a8b5a7cf7de906
(cherry picked from commit
aa6e84f21ddf89ea649a3f00044bc23adfe86978)
TreeHugger Robot [Fri, 17 Jun 2016 20:22:45 +0000 (20:22 +0000)]
Merge "QS Edit: Fix auto-selecting add location" into nyc-dev
Selim Cinek [Fri, 17 Jun 2016 20:08:00 +0000 (13:08 -0700)]
Fixed a bug where the expanded layout would flash
When the heads up disappeared from the shade, it's layout would
switch to the expanded state. We're now delaying this until
the animation is done.
Change-Id: I6c5c970f6b471fb10b197922dfea520b07c84abc
Fixes:
29318819
Chris Wren [Fri, 17 Jun 2016 19:47:19 +0000 (15:47 -0400)]
assume a generous prior in the rate estimator
currently with one data point the estimator is biased high. If we don't
have any data we want to be biased low to allow the first interaction
to be an isolated burst.
Also add metrics for enqueue rate to make it easier to debug this
code in the future (currently we only have metrics after the
rate limiter).
Bug:
29379789
Change-Id: I7b1d379290a55f120d039fd29d1bc0abbc6d4932
TreeHugger Robot [Fri, 17 Jun 2016 18:38:25 +0000 (18:38 +0000)]
Merge "QS API: Fix mService and mTile being null once and for all" into nyc-dev
Android Build Merger (Role) [Fri, 17 Jun 2016 18:35:50 +0000 (18:35 +0000)]
Merge "Merge \\"Docs: Completed updates to the Data Binding docs\\" into mnc-io-docs am:
eebe22fef6 am:
f693ea687f" into nyc-dev
Hemal Patel [Fri, 17 Jun 2016 18:35:24 +0000 (18:35 +0000)]
Merge \\"Docs: Completed updates to the Data Binding docs\\" into mnc-io-docs am:
eebe22fef6
am:
f693ea687f
Change-Id: I235e73606098e54fc14568c6437af314f9bea337
Joe Fernandez [Fri, 17 Jun 2016 18:35:07 +0000 (18:35 +0000)]
Merge "docs: NDK r12 release notes and downloads" into nyc-dev
Yigit Boyar [Fri, 17 Jun 2016 18:31:17 +0000 (18:31 +0000)]
Merge \"Docs: Completed updates to the Data Binding docs\" into mnc-io-docs
am:
eebe22fef6
Change-Id: I47b4003b1bd1bb5cdfc12bde543dd2c9d8babdcc
Hemal Patel [Fri, 17 Jun 2016 18:25:47 +0000 (18:25 +0000)]
Merge "Docs: Completed updates to the Data Binding docs" into mnc-io-docs
Chong Zhang [Fri, 17 Jun 2016 18:22:29 +0000 (18:22 +0000)]
Merge "Do a forceLayout if pending insets is changed after relayout window" into nyc-dev
Joe Fernandez [Thu, 16 Jun 2016 20:31:28 +0000 (13:31 -0700)]
docs: NDK r12 release notes and downloads
b/
29188616
Change-Id: Ida2b9b0e308799f9001127006e3be84318857aaa
Jason Monk [Fri, 17 Jun 2016 17:48:44 +0000 (13:48 -0400)]
QS: Fix missing tiles
It was possible for the state to be updated in the background
but before the callback was actually registered and never propagate
to the UI. Call the callback directly after it is added (from the
QS thread) to ensure that the current state gets sent out on tiles
being added.
Change-Id: Idd76dce5cbc9dc9c99f9b3dc13998751fd170582
Fixes:
29419435
Mady Mellor [Fri, 17 Jun 2016 17:22:34 +0000 (17:22 +0000)]
Merge "Fix shade background not aligning with bottom of a group" into nyc-dev
Jason Monk [Fri, 17 Jun 2016 17:22:01 +0000 (17:22 +0000)]
Merge "Bring out your toggles" into nyc-dev
Jason Monk [Fri, 17 Jun 2016 17:15:34 +0000 (13:15 -0400)]
QS Edit: Fix auto-selecting add location
We depend on a layout listener for when we ask for focus, but layout
sometimes doesn't happen. Make it always happen.
Change-Id: I7c805470c6ce9863bf7eac627f59d49191ce8946
Fixes:
29126464
Jason Monk [Fri, 17 Jun 2016 16:42:59 +0000 (12:42 -0400)]
QS API: Fix mService and mTile being null once and for all
Change-Id: Idd82e4c2f6cfc2b30432e15e23963c1d7a959e43
Fixes:
29121793
Aurimas Liutikas [Thu, 16 Jun 2016 19:15:56 +0000 (12:15 -0700)]
Fix spelling error in Core App Quality docs.
Bug:
https://code.google.com/p/android/issues/detail?id=213248
Change-Id: Idf83eb4fdc09bc3c78a7786b4bf11707178092c7
(cherry picked from commit
08b10586120f3db6e29e5ece9c3e05462f0c01e9)
Fyodor Kupolov [Fri, 17 Jun 2016 16:01:09 +0000 (16:01 +0000)]
Merge "Do not schedule restarts if the system is shutting down" into nyc-dev
Fyodor Kupolov [Fri, 17 Jun 2016 15:59:06 +0000 (15:59 +0000)]
Merge "Call AppOpsService from the handler thread" into nyc-dev
Jason Monk [Fri, 17 Jun 2016 14:19:43 +0000 (10:19 -0400)]
Bring out your toggles
Switch Wifi and BT back to toggling from QQS. Make cell open a
detail panel.
Change-Id: Ibdd8fa52a31c4bf81ee0e6974e263b46b6f71a31
Fixes:
29406644
Alan Viverette [Fri, 17 Jun 2016 13:59:12 +0000 (13:59 +0000)]
Merge "Notify user when application does not support current display zoom" into nyc-dev
Tony Mak [Fri, 17 Jun 2016 13:25:05 +0000 (13:25 +0000)]
Merge "Allow stopping user to access AppWidgetService API" into nyc-dev
Fyodor Kupolov [Thu, 16 Jun 2016 23:29:05 +0000 (16:29 -0700)]
Do not schedule restarts if the system is shutting down
Bug:
29357754
Change-Id: Id5cf43fb6c4c6ea04d60bd09e910a9cec194c753
Chong Zhang [Fri, 17 Jun 2016 00:28:25 +0000 (17:28 -0700)]
Do a forceLayout if pending insets is changed after relayout window
We might have a pending MSG_RESIZED_REPORT, but if it's executed after
relayoutWindow, mPendingInsets will already be the new value and it'll
not forceLayout. So we need to forceLayout here to make sure the measure
cache is cleared.
bug:
29391054
Change-Id: I73793b1427b89e75700369ec3b37053a6a732f0d
Christopher Tate [Fri, 17 Jun 2016 00:41:07 +0000 (00:41 +0000)]
DO NOT MERGE: Don\\\\\\\\\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2 am:
6633a4fee4 -s ours am:
41821a26a5 -s ours am:
b1e31ad140 am:
918fb5d453 am:
2149ebeadf -s ours am:
c61f35ed9a am:
34fb87b519 am:
1a450675f3
am:
790c87a05b -s ours
Change-Id: I33148f02fc665d5ffa7f6a651ce2b6102456eb1b
Christopher Tate [Fri, 17 Jun 2016 00:34:47 +0000 (00:34 +0000)]
DO NOT MERGE: Don\\\\\\\\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2 am:
6633a4fee4 -s ours am:
41821a26a5 -s ours am:
b1e31ad140 am:
918fb5d453 am:
2149ebeadf -s ours am:
c61f35ed9a am:
34fb87b519
am:
1a450675f3
Change-Id: I5fef884dbf640b60c1bf4c28a6d95abb4d42061b
Christopher Tate [Fri, 17 Jun 2016 00:32:26 +0000 (00:32 +0000)]
resolve merge conflicts of
cffb19c to mnc-dev am:
3f9ea2d386 am:
d6c1126fab am:
e2c9b1af3e
am:
d2a4e1b39c
Change-Id: I8e59a88278ba50ab7e3768031611065131ed6834
Christopher Tate [Fri, 17 Jun 2016 00:31:08 +0000 (00:31 +0000)]
DO NOT MERGE: Don\\\\\\\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2 am:
6633a4fee4 -s ours am:
41821a26a5 -s ours am:
b1e31ad140 am:
918fb5d453 am:
2149ebeadf -s ours am:
c61f35ed9a
am:
34fb87b519
Change-Id: If7444547d0bd82f43bb05439977e536a01589b3c
Christopher Tate [Fri, 17 Jun 2016 00:24:29 +0000 (00:24 +0000)]
resolve merge conflicts of
cffb19c to mnc-dev am:
3f9ea2d386 am:
d6c1126fab
am:
e2c9b1af3e
Change-Id: Iab52ff84be41c1d18274d1a82492b624a7456726
Christopher Tate [Fri, 17 Jun 2016 00:22:07 +0000 (00:22 +0000)]
DO NOT MERGE: Don\\\\\\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2 am:
6633a4fee4 -s ours am:
41821a26a5 -s ours am:
b1e31ad140 am:
918fb5d453 am:
2149ebeadf -s ours
am:
c61f35ed9a
Change-Id: Ied60b535ef69385c369110045ea755ebe9b0b94e
Christopher Tate [Fri, 17 Jun 2016 00:18:48 +0000 (00:18 +0000)]
resolve merge conflicts of
cffb19c to mnc-dev am:
3f9ea2d386
am:
d6c1126fab
Change-Id: I0414a137b1aab218fa57f291dbf2f7a1519bd973
Christopher Tate [Fri, 17 Jun 2016 00:15:14 +0000 (00:15 +0000)]
DO NOT MERGE: Don\\\\\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2 am:
6633a4fee4 -s ours am:
41821a26a5 -s ours am:
b1e31ad140 am:
918fb5d453
am:
2149ebeadf -s ours
Change-Id: I42300992feac56eb94ab71e160da5fa8fc04929a
Christopher Tate [Fri, 17 Jun 2016 00:15:07 +0000 (00:15 +0000)]
resolve merge conflicts of
cffb19c to mnc-dev
am:
3f9ea2d386
Change-Id: Iadf90edb02bacf645896f7d074d011a2aca4b251
Dianne Hackborn [Fri, 17 Jun 2016 00:05:47 +0000 (17:05 -0700)]
Work on issue #
29328569: NPE in " com.google.android.configupdater"
Make the activity manager look at the "killed" state of a process
before deciding it is in a state where a new client can attach to
a content provider. Hopefully this will get rid of some races
around attaching to providers and processes being killed.
Also add a little more information when killing a client of a
provider describing the oom adj of that provider's process.
Change-Id: I4efe5daf0a96e4663d5df88827ef401b1311de3f
Adrian Roos [Thu, 16 Jun 2016 23:33:55 +0000 (23:33 +0000)]
Merge "Remove RemoteInput on lockscreen setting" into nyc-dev
Christopher Tate [Thu, 16 Jun 2016 23:31:39 +0000 (16:31 -0700)]
resolve merge conflicts of
cffb19c to mnc-dev
Change-Id: I4dba574de2678d851e3d82961a07de27d61f5940
Andrew Solovay [Thu, 16 Jun 2016 23:29:13 +0000 (23:29 +0000)]
Merge "docs: DP4 release notes: add Android Auto known issue" into nyc-dev
Christopher Tate [Thu, 16 Jun 2016 22:53:29 +0000 (22:53 +0000)]
DO NOT MERGE: Don\\\\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2 am:
6633a4fee4 -s ours am:
41821a26a5 -s ours am:
b1e31ad140
am:
918fb5d453
Change-Id: I660124fada1a86288a9bfb10308cec0e1503f62e