Commit Graph

64173 Commits

Author SHA1 Message Date
Jason Monk
a5076ef7fa Merge \"QS Tiles: Fix some problems with connecting through intent\" into nyc-dev
am: 126088536d

Change-Id: I7e8ee5c59d7f26dcbc2406a53c0c6c39a9d8f55e
2016-06-22 16:54:06 +00:00
Jason Monk
8753e184f9 QS Tiles: Fix some problems with connecting through intent
- Don't send Tile through intent, it can cause crashes
 - Clean up other issues surrounding this

Change-Id: I08c626cf39b36d349592c1e0b81627b9bc7eeeb3
Fixes: 29519485
2016-06-22 10:52:58 -04:00
Calvin On
d7d16b9f37 Guard concurrent accesses to BluetoothA2dp service object
This fixes potential NPEs that happen on methods that access
mService after checking nullness, i.e. getConnectedDevices.

Bug: 29514788
Change-Id: Ic97054fd5a3563a374c0e863fb116c52535a6509
2016-06-22 01:08:03 +00:00
Android Build Merger (Role)
d74f7e7362 Merge "Merge \"Don\'t try and resolve WRAP_CONTENT too early.\" into nyc-dev am: 72ce991692" into nyc-mr1-dev 2016-06-21 23:37:12 +00:00
Android Build Merger (Role)
4d46efc084 Merge "Merge \"Tweaks to DragAndDropPermissions behavior\" into nyc-dev am: 22faa5ddb1" into nyc-mr1-dev 2016-06-21 23:37:00 +00:00
Android Build Merger (Role)
9de968daed Merge "Merge \"Add getApplicationConfigForPackage\" into nyc-dev am: abe85d3886" into nyc-mr1-dev 2016-06-21 23:36:02 +00:00
Makoto Onuki
3c67b3e47c Merge "Shortcut Manager: Address API council feedback and fix TODOs" into nyc-mr1-dev 2016-06-21 23:35:16 +00:00
Robert Carr
d748b54615 Merge \"Don\'t try and resolve WRAP_CONTENT too early.\" into nyc-dev
am: 72ce991692

Change-Id: I277968e2a48ac5647db0f03877ab168afc245a6c
2016-06-21 23:35:11 +00:00
Yorke Lee
d22536666a Merge \"Tweaks to DragAndDropPermissions behavior\" into nyc-dev
am: 22faa5ddb1

Change-Id: Ia37191b026b85773d27b41b7991238a07e141a12
2016-06-21 23:35:09 +00:00
Chad Brubaker
b375228afe Merge \"Add getApplicationConfigForPackage\" into nyc-dev
am: abe85d3886

Change-Id: I9eb13d905ee68e16b64702180c196f12c9b68828
2016-06-21 23:35:00 +00:00
Makoto Onuki
b5a012fd6f Shortcut Manager: Address API council feedback and fix TODOs
Bug 29515722
Bug 29516909
Bug 29515090
Bug 29516954
Bug 29515088

Change-Id: Ibe1d27033cbd0fd50d37e3d9945b47551211c568
2016-06-21 14:42:48 -07:00
TreeHugger Robot
72ce991692 Merge "Don't try and resolve WRAP_CONTENT too early." into nyc-dev 2016-06-21 21:24:02 +00:00
Yorke Lee
22faa5ddb1 Merge "Tweaks to DragAndDropPermissions behavior" into nyc-dev 2016-06-21 21:10:53 +00:00
Yorke Lee
c8ad0cd316 Tweaks to DragAndDropPermissions behavior
No longer release permissions in finalize(), so that
apps do not have to maintain a reference to the
DragAndDropPermissions object.

Also make it parcelable, so that permission instances can be
retained across activity instances so that they can be
manually released.

Bug: 29162822

Change-Id: Ie604dd3e83ee45a8665d743449b91857dd54e896
2016-06-21 12:57:52 -07:00
TreeHugger Robot
abe85d3886 Merge "Add getApplicationConfigForPackage" into nyc-dev 2016-06-21 19:51:21 +00:00
Dianne Hackborn
580f2e159e Merge \"Reduce race when connecting to an existing content provider.\" into nyc-dev
am: 5f9afa968d

Change-Id: I7ca258416372dd251759aa920f51c2486d432f9c
2016-06-21 19:27:31 +00:00
Dianne Hackborn
5f9afa968d Merge "Reduce race when connecting to an existing content provider." into nyc-dev 2016-06-21 19:18:39 +00:00
Dianne Hackborn
4de5a3ac66 Reduce race when connecting to an existing content provider.
We lost the code that checks to see if the target process still
exists and aborts trying to use it if so.  To reduce the race
there, we have a new explicit check of the state of the process.

Hopefully fixes some of issue #28737082.

Change-Id: I37a7a6e9767516d564168ef5e110c4adafe3fb76
2016-06-21 10:04:22 -07:00
Todd Kennedy
409b0a13e1 Change prefix based upon mask
The mask may not be all F's.

Change-Id: I50ff4e4fb95af2037b84a1531b60dd9c0986bf86
2016-06-21 09:42:08 -07:00
Chris Banes
3b925c1ab0 Fix NPE in Toolbar - framework edition
Caused by super constructor calling non-final methods
which Toolbar overrides, and then tries to reference
final variables.

BUG: 28806107
Change-Id: Ieaf5f7611dbbf954e49c31e604aa2f7627248615
2016-06-21 08:09:24 +00:00
Robert Carr
07421cb9bb Don't try and resolve WRAP_CONTENT too early.
At the point of showDropDownPosition measure
may have not yet been called and we can't try
and resolve WRAP_CONTENT. ViewRoot will do it for us
and set requestedWidth/Height at an appropriate point.

Bug: 29496188
Change-Id: I99f26612bec800f3e321495b3df3e37b5ffb3152
2016-06-20 15:55:02 -07:00
Antonio Cansado
43f0bd6e60 Merge \"Fix infinite loop when registering data usage callback.\" into nyc-dev
am: c20ffc2a9e

Change-Id: I3839e516a128befbfe677b17b05a557b9e0afd87
2016-06-20 22:29:45 +00:00
Antonio Cansado
c20ffc2a9e Merge "Fix infinite loop when registering data usage callback." into nyc-dev 2016-06-20 22:23:36 +00:00
Antonio Cansado
f704837429 Fix infinite loop when registering data usage callback.
Trivial fix is to call the method that takes the handler as a param.

Bug: 29508547
Change-Id: I75ba30a1663be265eed56b24deda82e83fd47a43
2016-06-20 15:03:03 -07:00
Roozbeh Pournader
ad48dc18a5 Revert "Mark Serbian in Latin script as non-localized [DO NOT MERGE]"
This reverts commit e977b0ae59 for MR1.
The original commit is only intended for N, not MR1.
2016-06-20 14:59:29 -07:00
Roozbeh Pournader
73939d8a60 Merge \"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\" into nyc-dev
am: 160126e2d8

Change-Id: I9e26a77ba4e186a9e3fd59b9618b3eb36127178f
2016-06-20 21:44:42 +00:00
Roozbeh Pournader
160126e2d8 Merge "Mark Serbian in Latin script as non-localized [DO NOT MERGE]" into nyc-dev 2016-06-20 21:39:22 +00:00
Makoto Onuki
901c03faba Merge "Launcher shortcut callback should deliver manifest shortcuts too" into nyc-mr1-dev 2016-06-20 21:06:42 +00:00
Adam Lesinski
a804fae3be Merge \"BatteryStats: record best estimated battery capacity\" into nyc-dev
am: c2e06a55f9

Change-Id: I4f590635c720ddbb6dfac292753606b9d3fe16e0
2016-06-20 19:55:37 +00:00
TreeHugger Robot
c2e06a55f9 Merge "BatteryStats: record best estimated battery capacity" into nyc-dev 2016-06-20 19:49:46 +00:00
Chad Brubaker
9f779ab4af Add getApplicationConfigForPackage
getApplicationConfigForPackage will be used by system components that
need to make connections for apps, e.g. DownloadManager, so that their
secure connections have the same configuration as those from the app
itself.

Bug: 29505888
Change-Id: Idf1cac6307431911eda34529d3fd50f9ca0da314
2016-06-20 12:40:20 -07:00
Roozbeh Pournader
63ed39f395 Merge "Fix AAPT-compatible output format for locales" into nyc-mr1-dev 2016-06-20 19:22:27 +00:00
TreeHugger Robot
acc21f572d Merge "fix resolver" into nyc-mr1-dev 2016-06-20 18:45:04 +00:00
Android Build Merger (Role)
6806472ab9 Merge "Merge \"Use newly fetched PackageInfo for loading WebView code.\" into nyc-dev am: cdbf412f8e" into nyc-mr1-dev 2016-06-20 18:23:48 +00:00
Gustav Sennton
47b391cf1d Merge \"Use newly fetched PackageInfo for loading WebView code.\" into nyc-dev
am: cdbf412f8e

Change-Id: Ia7ced5f34f7f97e788d48bc0239dfcb640bbdaa6
2016-06-20 18:23:26 +00:00
Trevor Bunker
d94a40f46d Merge "Enable tap-to-pulse only when needed" into nyc-mr1-dev 2016-06-20 18:23:18 +00:00
Gustav Sennton
cdbf412f8e Merge "Use newly fetched PackageInfo for loading WebView code." into nyc-dev 2016-06-20 18:17:06 +00:00
Adam Lesinski
f9b20a9ec4 BatteryStats: record best estimated battery capacity
Using the coulomb counter, record the estimated max battery
capacity.

Bug:28743761
Change-Id: I1270b062cf4a1e6fd69ea1da3de11a85a81b3663
2016-06-20 10:58:37 -07:00
Christopher Tate
0754128dc9 Merge \"Let bmgr inspect the set of whitelisted transports\" into nyc-dev
am: 0f101342e1

Change-Id: I5249aed8cf49c0da111324d5c6ab43b46cdb1196
2016-06-20 17:36:58 +00:00
Robin Lee
964aaea69c Remove @return from void API javadoc
am: 6918675fa1

Change-Id: I70f711ac3bc16d2e2a524de21e5fb8b3548270dc
2016-06-20 17:33:24 +00:00
Christine Hallstrom
ac1873b2fc Merge "Fix early termination of while loop in BluetoothSocket#write" into nyc-mr1-dev 2016-06-20 17:23:02 +00:00
Chris Tate
0f101342e1 Merge "Let bmgr inspect the set of whitelisted transports" into nyc-dev 2016-06-20 17:19:55 +00:00
Todd Kennedy
958b3410bf fix resolver
Change-Id: I31649d0f85b7b6553a6ecf38fd7c08279b85a0a6
2016-06-20 10:06:06 -07:00
Makoto Onuki
4d6b87ffdf Launcher shortcut callback should deliver manifest shortcuts too
- Also include "activity" in the key fields, as this is now an
important field.

- Also optimize ShortcutInfo parceling for the "key field only" case.

Bug 29394043
Bug 29451629

Change-Id: I61b2bc2f61ad6ebdcbaf6d02f1bd88777c45a7f0
2016-06-20 09:28:05 -07:00
Adrian Roos
9918234dcf Enable tap-to-pulse only when needed
- Adds InputManager.setPulseEnabled().
- Adds a config overlay for the file controlling touch-to-pulse.
- Hooks up DreamManagerService with InputManager.setPulseEnabled().

Bug: 29253550
Change-Id: I4892311cc30e97d31f7be778930397fbe5c03945
2016-06-20 08:59:48 -07:00
Robin Lee
6918675fa1 Remove @return from void API javadoc
Fix: 29500429
Change-Id: Ieddf211ad881e2e48bf593dcde6d262dd5be6c5c
(cherry picked from commit b3d6b13ad5)
2016-06-20 14:53:58 +00:00
Gustav Sennton
b088cb36b8 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
2016-06-20 14:30:27 +01:00
Roozbeh Pournader
309ebd6430 Fix AAPT-compatible output format for locales
The previous code used a format that is not supported by AAPT,
although it claimed it was. The new code generates locale codes in
the format AAPT can consume, using xx and xx-rYY for simple locales,
and the b+ format for everything else.

Bug: 25599046
Change-Id: I34d432f23b84913d313d6562c110d7fad87c457a
2016-06-17 22:24:54 -07:00
Svetoslav Ganov
8011f5ed1c Merge \"Fix a race in local settings caches\" into nyc-dev
am: f4ddb7ce30

Change-Id: If28342d6deab7d0b7e89029229bad060ce7c8a8d
2016-06-18 02:22:52 +00:00
Calvin On
8dad883759 Merge \"Fix race with BT disable in BLE_ON_STATE\" into nyc-dev
am: 1bf8782605

Change-Id: I60d35a8139caf0a1c839654d6c488fede4fa37d7
2016-06-18 02:22:50 +00:00