Commit Graph

58516 Commits

Author SHA1 Message Date
Adam Lesinski
e894efa9b6 Merge \"ContextImpl: Keep DisplayAdjustments and Display in sync\" into nyc-dev
am: 0bf31c3fa6

Change-Id: Id0d16d2f9d69b87d4b4c01370eeceafe329d1817
2016-06-22 19:16:44 +00:00
Adam Lesinski
0bf31c3fa6 Merge "ContextImpl: Keep DisplayAdjustments and Display in sync" into nyc-dev 2016-06-22 19:11:36 +00:00
TreeHugger Robot
f8142e5bf3 Merge changes from topic 'seamless-rotation' into nyc-mr1-dev
* changes:
  Enable resize during relayout fix for all stacks.
  SurfaceView: Careful with FLAG_PRESERVE_GEOMETRY.
  Implement seamless rotation mode.
2016-06-22 17:40:48 +00:00
Dianne Hackborn
3f19c95ec5 Merge \"Fix issue #29545190: JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...\" into nyc-dev
am: a62a7eef24

Change-Id: Ieb9435479b727da5ea3ce5f512b43986898675fd
2016-06-22 17:18:29 +00:00
Dianne Hackborn
a62a7eef24 Merge "Fix issue #29545190: JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag..." into nyc-dev 2016-06-22 17:12:09 +00:00
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
Dianne Hackborn
121e1645d1 Fix issue #29545190: JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...
...isn't respected if previous job was scheduled with same URI

Change-Id: Ib04f6d7cf72e7efc8e84c1a759e91ba520eda139
2016-06-21 20:39:02 -07: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
Adam Lesinski
4ece3d6bb1 ContextImpl: Keep DisplayAdjustments and Display in sync
Make sure that when our Resources get updated, that DisplayAdjustment
and Display properly reflect the potentially new screen dimensions.

Bug:28388969
Change-Id: I340550ea094ece87abc8790dd46aaa60ab3cedd3
2016-06-21 17:55:58 -07:00
Robert Carr
15e0bb4264 SurfaceView: Careful with FLAG_PRESERVE_GEOMETRY.
We need to be careful about stripping FLAG_PRESERVE_GEOMETRY
as it breaks render thread sync. Notably we don't need
to strip it in the case of mUpdateWindowNeeded, this just signals
that Window#resized has been called, or something similar, but if there
has been no actual size change, then we can leave the geometry to
the render thread. This particularly manifests in rotation scenarios
where the SurfaceView will receive resize ahead of the app receiving
a configuration change.

Bug: 28823590
Change-Id: Ie2bbe7d9bd9f0a5ab64a08776bae7344eaecb605
2016-06-21 17:13:19 -07:00
Robert Carr
6da3cc0237 Implement seamless rotation mode.
Add a rotation mode which does not require freezing
the screen. For situations like Camera where only small
elements move on screen, this allows for seamless changes
of display orientation. This is achieved by transforming the
windows with their current buffer in the same transaction that
we rotate the display. We set things up so the windows are
frozen this way until they submit buffers in the new orientation.
There is a special case in the Camera window itself, and it's use
of NATIVE_WINDOW_TRANSFORM_INVERSE_DISPLAY. In this case the buffer
contents are rotated by SurfaceFlinger and will never resize, for these
windows we just need to update the scaling matrix.

Bug: 28823590
Change-Id: I52dc6a86fcb3c08f736f0977ba3975a24fb8136c
2016-06-21 17:13:15 -07: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
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