OSDN Git Service
Julia Reynolds [Mon, 20 Jun 2016 17:36:51 +0000 (17:36 +0000)]
Merge \"Don\'t reference variables before they are assigned.\" into nyc-dev
am:
2d5c95f5b9
Change-Id: I18651fef3ca880ee287d89f0ab4ba80f94f1dced
Narayan Kamath [Mon, 20 Jun 2016 17:33:26 +0000 (17:33 +0000)]
Merge \"PackageManager: Don\'t fail app installs if dexopt fails.\" into nyc-dev
am:
5ae42bb661
Change-Id: I7892f2f35f6f43d98d4a01ff9c5bb64df486d11b
Robin Lee [Mon, 20 Jun 2016 17:33:24 +0000 (17:33 +0000)]
Remove @return from void API javadoc
am:
6918675fa1
Change-Id: I70f711ac3bc16d2e2a524de21e5fb8b3548270dc
Jason Monk [Mon, 20 Jun 2016 17:33:22 +0000 (17:33 +0000)]
Merge \"QS: Fix missing tiles\" into nyc-dev
am:
bd04ec31bd
Change-Id: I7889f69b9f216016ab23e95420e6c1b90f58769b
Shreyas Basarge [Mon, 20 Jun 2016 17:33:19 +0000 (17:33 +0000)]
Merge \"Fix for the missing sync bug\" into nyc-dev
am:
70b6cd903e
Change-Id: I5b57674eccd5e84bde033bb3277f88d86349a6b3
Chris Wren [Mon, 20 Jun 2016 17:33:15 +0000 (17:33 +0000)]
Merge \"assume a generous prior in the rate estimator\" into nyc-dev
am:
fddf5df01f
Change-Id: I73dc1cb6a2a13bac21ff576319e7b9123aee09b3
Christine Hallstrom [Mon, 20 Jun 2016 17:23:00 +0000 (17:23 +0000)]
Merge "Fix early termination of while loop in BluetoothSocket#write" into nyc-mr1-dev
Andrew Sapperstein [Mon, 20 Jun 2016 17:15:04 +0000 (17:15 +0000)]
Merge "Use colorAccent for fullscreen tutorial." into nyc-mr1-dev
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
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
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
Andrew Sapperstein [Sun, 19 Jun 2016 18:42:57 +0000 (11:42 -0700)]
Use colorAccent for fullscreen tutorial.
Previously the colors were hardcoded to #009688 which is the light
theme's accent color.
Change-Id: Ie7f8560751090ef040d87803c0036a4199c749ae
FIXES:
29461850
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
Felipe Leme [Wed, 8 Jun 2016 20:43:08 +0000 (13:43 -0700)]
Split mRulesLock in 2 distinct locks.
mRulesLock was used to lock Life, the Universe, and Everything. Or more
specifically, UID rules, network policies, and other state.
As such, it was frequently a cause of slowness in the device due to lock
contention. For example, isNetworkMetered() is a method called by
ConnectivityService and it only needs to lock the network policies info,
but because it required the full lock, it would be often on hold when
the UID state is changed by onUidStateChanged().
BUG:
29397827
Change-Id: I7aac8f33e150c52cf7a682f0290a91a2c350b8de
John Reck [Sat, 18 Jun 2016 02:28:02 +0000 (02:28 +0000)]
Merge \"DO NOT MERGE Move SurfaceView offscreen if the app stops drawing it\" into nyc-dev
am:
d11b5e6661
Change-Id: Ide1396069ee945f744cbc0ece45990b0e5d49dab
John Reck [Sat, 18 Jun 2016 02:22:54 +0000 (02:22 +0000)]
Merge \"Avoid re-calculating vsync mid-frame\" into nyc-dev
am:
fc275d244e
Change-Id: I295b6e60a7b2fdcdce3692e74fe54755845132e0
Svetoslav Ganov [Sat, 18 Jun 2016 02:22:52 +0000 (02:22 +0000)]
Merge \"Fix a race in local settings caches\" into nyc-dev
am:
f4ddb7ce30
Change-Id: If28342d6deab7d0b7e89029229bad060ce7c8a8d
Calvin On [Sat, 18 Jun 2016 02:22:50 +0000 (02:22 +0000)]
Merge \"Fix race with BT disable in BLE_ON_STATE\" into nyc-dev
am:
1bf8782605
Change-Id: I60d35a8139caf0a1c839654d6c488fede4fa37d7
Adrian Roos [Sat, 18 Jun 2016 02:22:46 +0000 (02:22 +0000)]
Merge \"Fix data race\" into nyc-dev
am:
838dfe60f0
Change-Id: I8e901f9625e89f62c699018159b7ec2b5bfe64d4
Christopher Tate [Sat, 18 Jun 2016 02:22:43 +0000 (02:22 +0000)]
Merge \"Unspecified alarm worksource names are the rule, not the exception\" into nyc-dev
am:
4eaaf7c8ff
Change-Id: I21a5ef225a2c6f6693940ee32f3248c01823b9e2
Aurimas Liutikas [Sat, 18 Jun 2016 02:15:43 +0000 (02:15 +0000)]
Merge \\\"Fix spelling error in Core App Quality docs.\\\" into mnc-io-docs am:
3c8b96ad1f am:
cd9cc200d8
am:
f33ce4e846
Change-Id: I1947d4f7d38ad986a3babbeff5566870d25e4f6a
Sudheer Shanka [Sat, 18 Jun 2016 02:15:42 +0000 (02:15 +0000)]
Merge \"Add pm operation to set user restrictions.\" into nyc-dev
am:
f6824b51cc
Change-Id: I355632fa26c9d85a5d41d18ca298fc704117fc48
Amith Yamasani [Sat, 18 Jun 2016 02:15:40 +0000 (02:15 +0000)]
Merge \"Clean up ex-users in lock settings db\" into nyc-dev
am:
8cbe1a6309
Change-Id: Ic00c1a01c111dd32c124f74b17ecb242db3e87b0
Svet Ganov [Sat, 18 Jun 2016 02:15:38 +0000 (02:15 +0000)]
Merge \"Don\'t dispatch Uris with appended user handle\" into nyc-dev
am:
7ef9f61be6
Change-Id: I8cea3262da232ad0b3086cb55c54495d3c86db66
Winson [Sat, 18 Jun 2016 02:15:36 +0000 (02:15 +0000)]
Merge \"Ensure that the tint is properly applied in docked mode.\" into nyc-dev
am:
b1f3404f8f
Change-Id: I698fdb7168602772e451fc305118ce8906532b92
Dianne Hackborn [Sat, 18 Jun 2016 02:10:02 +0000 (02:10 +0000)]
Merge \"Work on issue #
29328569: NPE in \" com.google.android.configupdater\"\" into nyc-dev
am:
6bc33b07f4
Change-Id: Idd1a2bffd1425f541df6bea7c064fd9389a24638
Jason Monk [Sat, 18 Jun 2016 02:10:00 +0000 (02:10 +0000)]
Merge \"QS Edit: Fix auto-selecting add location\" into nyc-dev
am:
dd65ee628f
Change-Id: I8ed8ebe24e18b5f32a07e26407bf30d36411dc0d
Jason Monk [Sat, 18 Jun 2016 02:09:57 +0000 (02:09 +0000)]
Merge \"QS API: Fix mService and mTile being null once and for all\" into nyc-dev
am:
fc70b07385
Change-Id: I7327f5e4f7ac2180e0c584dc761b861c14dd475f
Hemal Patel [Sat, 18 Jun 2016 02:09:56 +0000 (02:09 +0000)]
Merge \"Merge \\\"Docs: Completed updates to the Data Binding docs\\\" into mnc-io-docs am:
eebe22fef6 am:
f693ea687f\" into nyc-dev
am:
68bfdd71b5
Change-Id: I92d054ac139106e5eca64cb35899c0b2ba80b94e
Joe Fernandez [Sat, 18 Jun 2016 02:09:54 +0000 (02:09 +0000)]
Merge \"docs: NDK r12 release notes and downloads\" into nyc-dev
am:
9f0722a4c7
Change-Id: Ife731a264b13dd34bb7c3be34df7bddd96ad3dc6
Chong Zhang [Sat, 18 Jun 2016 02:07:55 +0000 (02:07 +0000)]
Merge \"Do a forceLayout if pending insets is changed after relayout window\" into nyc-dev
am:
2756d0707f
Change-Id: I72a8192317ebaa7c036416a65b415c2471f449de
Mady Mellor [Sat, 18 Jun 2016 02:07:53 +0000 (02:07 +0000)]
Merge \"Fix shade background not aligning with bottom of a group\" into nyc-dev
am:
4f9404f6f2
Change-Id: Id157e63ed4950f422b7cfefbbb2c4a589a70dd3d
Jason Monk [Sat, 18 Jun 2016 02:07:51 +0000 (02:07 +0000)]
Merge \"Bring out your toggles\" into nyc-dev
am:
3aee783837
Change-Id: I4e069cd88bc154e7636fcc9fed739d5fedd604a4
Fyodor Kupolov [Sat, 18 Jun 2016 02:07:49 +0000 (02:07 +0000)]
Merge \"Do not schedule restarts if the system is shutting down\" into nyc-dev
am:
1f0151220e
Change-Id: I34df39f82516cb0e40c12a25340a7b3bb2c5f65a
Fyodor Kupolov [Sat, 18 Jun 2016 02:07:47 +0000 (02:07 +0000)]
Merge \"Call AppOpsService from the handler thread\" into nyc-dev
am:
1347cdb2e1
Change-Id: Ia3adf0e08a7612c39b6e2e040c1bde2efb46dea9
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
Alan Viverette [Sat, 18 Jun 2016 02:05:10 +0000 (02:05 +0000)]
Merge \"Notify user when application does not support current display zoom\" into nyc-dev
am:
c577a50d09 -s ours
Change-Id: I1d43ee5ecd627edd952979e300253de3c49f2218
TreeHugger Robot [Sat, 18 Jun 2016 02:00:59 +0000 (02:00 +0000)]
Merge "Avoid re-calculating vsync mid-frame" into nyc-dev
TreeHugger Robot [Sat, 18 Jun 2016 01:35:18 +0000 (01:35 +0000)]
Merge "Refactored unnecessary calls to updateRulesForGlobalChangeLocked()." into nyc-mr1-dev
TreeHugger Robot [Sat, 18 Jun 2016 00:30:26 +0000 (00:30 +0000)]
Merge "Fix a race in local settings caches" into nyc-dev
TreeHugger Robot [Sat, 18 Jun 2016 00:26:42 +0000 (00:26 +0000)]
Merge "Catch throwable exceptions." into nyc-mr1-dev
Wei Wang [Sat, 18 Jun 2016 00:19:40 +0000 (00:19 +0000)]
Merge "remove Intent.FLAG_ACTIVITY_NEW_TASK flag check" into nyc-mr1-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
Christine Hallstrom [Fri, 17 Jun 2016 23:00:25 +0000 (16:00 -0700)]
Fix early termination of while loop in BluetoothSocket#write
While loop exits too early and misses writing remaining bytes.
Also restructured the loop itself to be more readable.
Change-Id: I71e9b331d20b5ae70175450c3346be43ab56c40c
TreeHugger Robot [Fri, 17 Jun 2016 23:42:58 +0000 (23:42 +0000)]
Merge "Fix data race" into nyc-dev
Yohei Yukawa [Fri, 17 Jun 2016 23:23:56 +0000 (23:23 +0000)]
Merge "API Rename: IC#inputContent to IC#commitContent." into nyc-mr1-dev
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
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
Christopher Ferris [Fri, 17 Jun 2016 22:29:58 +0000 (15:29 -0700)]
Catch throwable exceptions.
If the zygote dies early enough, certain exceptions disappear and never
result in an error message in the log. Fix the code to catch all
Throwable exceptions so that an error message does not result in a
silent restart of the zygote.
Bug:
29400363
Change-Id: Ib044006629ea4441728921f3c587d0cb295ec745
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
Makoto Onuki [Fri, 17 Jun 2016 20:29:37 +0000 (20:29 +0000)]
Merge "Update manifest shortcut XML schema" into nyc-mr1-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
Fan Zhang [Fri, 17 Jun 2016 20:15:46 +0000 (20:15 +0000)]
Merge "Add metrics for new tabs in Settings." into nyc-mr1-dev
John Reck [Fri, 17 Jun 2016 20:13:19 +0000 (20:13 +0000)]
Merge "Move SurfaceView offscreen if the app stops drawing it" into nyc-mr1-dev
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
Makoto Onuki [Thu, 16 Jun 2016 16:51:40 +0000 (09:51 -0700)]
Update manifest shortcut XML schema
Use the standard <intent> tag instead of custom tags.
- Also fix setDynamicShortcuts(), which was broken in the previous CL.
- Also tolerate runtime exceptions while parsing XMLs
- Also fix b/
29422018 while I'm at it
Bug
29390156
Bug
29077932
Bug
29422018
Change-Id: I2756c9d66c6d7b2962a982d9e57a7d84a5755b28
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
Sanket Padawe [Fri, 17 Jun 2016 17:24:12 +0000 (17:24 +0000)]
Merge "Modify TelephonyHistogram.java functions." into nyc-mr1-dev
John Reck [Thu, 16 Jun 2016 22:36:13 +0000 (15:36 -0700)]
Move SurfaceView offscreen if the app stops drawing it
Bug:
29360411
Change-Id: Iefb9d7a9dafb34a2b4f79130a2a8b5a7cf7de906
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
Yohei Yukawa [Fri, 17 Jun 2016 17:10:39 +0000 (10:10 -0700)]
API Rename: IC#inputContent to IC#commitContent.
As shown in below, we have already used commit* naming convention in
InputConnection.
- InputConnection#commitCompletion(CompletionInfo);
- InputConnection#commitCorrection(CorrectionInfo);
- InputConnection#commitText(CharSequence, int);
Hence renaming IC#inputContent() to IC#commitContent() would make the
new method more consistent.
Bug:
29450024
Change-Id: Ica1ba3154795c1bf44e140dfe639b299f83cd8af
Tony Mak [Fri, 17 Jun 2016 17:09:22 +0000 (17:09 +0000)]
Merge \"Allow stopping user to access AppWidgetService API\" into nyc-dev
am:
ab8d4cf645
Change-Id: I2280fae9d85594ad0fde5d552ff07b0d4e0c6158
Christopher Tate [Fri, 17 Jun 2016 17:09:16 +0000 (17:09 +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
am:
02435d2419
Change-Id: I97b8993491e9a7441177f9d521f9971cf2c155a5
Christopher Tate [Fri, 17 Jun 2016 17:09:13 +0000 (17:09 +0000)]
resolve merge conflicts of
cffb19c to mnc-dev am:
3f9ea2d386 am:
d6c1126fab am:
e2c9b1af3e am:
d2a4e1b39c
am:
1c3be1a5b1
Change-Id: If72735aeb86874e3d672a9567f03fecdb9ed00eb
Adrian Roos [Fri, 17 Jun 2016 17:09:01 +0000 (17:09 +0000)]
Merge \"Remove RemoteInput on lockscreen setting\" into nyc-dev
am:
a66746d167
Change-Id: If3724770b370b83c3de9e30a0c917d4ad1bc72d5
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
TreeHugger Robot [Fri, 17 Jun 2016 01:12:30 +0000 (01:12 +0000)]
Merge "Support AVD animation falling back on UI thread" into nyc-mr1-dev