Commit Graph

64030 Commits

Author SHA1 Message Date
Tomasz Mikolajewski
499ab43ce3 Merge \"Make CotentResolver#openInputStream handle errors from reliable pipes.\" into nyc-dev
am: ac3fe8fffe

Change-Id: Ib09cea9ca5c6bb18dc16ffac70f23fa4b3ffd974
2016-06-14 04:24:39 +00:00
Tomasz Mikolajewski
ac3fe8fffe Merge "Make CotentResolver#openInputStream handle errors from reliable pipes." into nyc-dev 2016-06-14 04:15:26 +00:00
Chad Brubaker
193efc8bd0 Merge \"Use NoPreloadHolder for certificate sources\" into nyc-dev
am: c738e48ed6

Change-Id: Iaf9a202979335c18b2c55c27530ef84e129ccf76
2016-06-14 00:47:21 +00:00
TreeHugger Robot
c738e48ed6 Merge "Use NoPreloadHolder for certificate sources" into nyc-dev 2016-06-14 00:35:49 +00:00
Yohei Yukawa
03f759e87e Merge "Add InputConnection#insertContent()." into nyc-mr1-dev 2016-06-14 00:26:39 +00:00
Chad Brubaker
319f9fe102 Use NoPreloadHolder for certificate sources
The static instances of SystemCertificateSource and
UserCertificateSource depend on the current user, avoid triggering their
static initializer when preloaded.

Bug: 29258379
Change-Id: I5088366ae67145b8bc928d6c04118529c82a7fc3
2016-06-13 15:51:40 -07:00
Adrian Roos
c8649b381d Merge \"Add MessagingStyle transitions\" into nyc-dev
am: a5e2aa99c0

Change-Id: Ib667411e14309d38f60b254178d7fc7d71eedde0
2016-06-13 21:55:06 +00:00
Adrian Roos
a5e2aa99c0 Merge "Add MessagingStyle transitions" into nyc-dev 2016-06-13 21:45:08 +00:00
Adrian Roos
feafa052f3 Add MessagingStyle transitions
Fixes a particularly bad transition in the case where there
is one incoming message to a group.

Change-Id: Ieddece4a496292a69e14cdcd74d94986938d8223
Fixes: 29043489
2016-06-13 14:31:51 -07:00
Makoto Onuki
78f16950c6 Merge \"Push DO/PO package names from DPMS to PM\" into nyc-dev
am: f419bd9e03

Change-Id: Ic3071f3a712da72fd141ef37ac6aabe6dbd09355
2016-06-13 21:23:18 +00:00
Daniel Nishi
7374971c28 Merge "Add a flag to toggle how much the storage manager should retain." into nyc-mr1-dev 2016-06-13 21:18:29 +00:00
Makoto Onuki
f419bd9e03 Merge "Push DO/PO package names from DPMS to PM" into nyc-dev 2016-06-13 21:16:29 +00:00
Doris Liu
a28f0003eb Merge \"Fix setCurrentPlayTime for started but not yet pulsed animations\" into nyc-dev
am: 42d39300cf

Change-Id: I7c1f2adb31ece266b082ffb9ea85b17c083b518c
2016-06-13 20:31:32 +00:00
Doris Liu
42d39300cf Merge "Fix setCurrentPlayTime for started but not yet pulsed animations" into nyc-dev 2016-06-13 20:24:45 +00:00
Yorke Lee
fead52ebf4 Merge \"Check for detached view in drag-related APIs\" into nyc-dev
am: cdc9d7bed9

Change-Id: Id1c2228d081e63e86278072654c4c611bdb10d1a
2016-06-13 20:15:15 +00:00
TreeHugger Robot
cdc9d7bed9 Merge "Check for detached view in drag-related APIs" into nyc-dev 2016-06-13 20:09:43 +00:00
Svetoslav Ganov
3224aa7505 Merge \"Fix permissions update for VrListenerService on user changes.\" into nyc-dev
am: d054f4f2fe

Change-Id: Ib69afe57e65ea7564be3bd97124ac950862d71cb
2016-06-13 20:03:40 +00:00
Ruben Brunk
d054f4f2fe Merge "Fix permissions update for VrListenerService on user changes." into nyc-dev 2016-06-13 19:58:31 +00:00
Yorke Lee
07452c37ab Check for detached view in drag-related APIs
Bug: 29253539
Change-Id: I26285404ee15bb17e87ac23c67f7c3c6aaa2d968
2016-06-13 11:32:23 -07:00
Daniel Nishi
c535be179a Add a flag to toggle how much the storage manager should retain.
This flag is used to set how many days of storage the automatic
storage manager will retain when clearing data.

Bug: 28965462
Change-Id: I87afafb7d3252d8c390ea43b7c45fd923f911e4e
2016-06-13 10:54:31 -07:00
Doris Liu
caa2ebf814 Fix setCurrentPlayTime for started but not yet pulsed animations
Also fix the behavior for calling reverse() immediately after
start(). Such case now triggers end() right away, which is
consistent with what the animation would do in M.

Bug: 29271714
Change-Id: I045e36e039179a3c462f22bc6a3a765437de4074
2016-06-13 17:29:03 +00:00
TreeHugger Robot
b71c36b000 Merge "Otadexopt: Expose progress percentage" into nyc-mr1-dev 2016-06-13 16:52:18 +00:00
Tao Bao
9aa66d57c6 Merge "Add RecoverySystem.rebootWipeAb() system API." into nyc-mr1-dev 2016-06-13 16:43:46 +00:00
Makoto Onuki
5b8f5fd38b Merge "Fix some exception messages and enhance unit tets" into nyc-mr1-dev 2016-06-13 16:28:32 +00:00
Yohei Yukawa
152944f490 Add InputConnection#insertContent().
Providing an official protocol for IMEs to insert an image to the
application is something that has been requested from many IME
developers to Android OS.  With this CL, IMEs are able to ask
applications to insert a content including image files as follows.

 1. An application that opts in to this protocol specifies a list of
    supported content MIME types in EditorInfo#contentMimeTypes.
 2. When an IME is actively interacting with such an application, the
    IME can call InputConnection#insertContent() with a InputContentInfo
    that contains content URI, metadata (ClipDescription), and an
    optional link URI.
 3. The application can read the stream data from the given content URI
    to insert the content into somewhere in the application.

Detailed design background can be found in the JavaDoc of
InputConnection#insertContent().

Bug: 22830793
Change-Id: Iaadf934a997ffcd6000a516cc3c1873db56e60ad
2016-06-10 19:04:34 -07:00
Andrii Kulian
a9b59e9cf2 Merge \"Reinflate primary action mode view after detach\" into nyc-dev
am: 82f2df6108

Change-Id: Ic6def2b3eb5e654b028d11773a9527f01943289d
2016-06-11 01:38:36 +00:00
TreeHugger Robot
82f2df6108 Merge "Reinflate primary action mode view after detach" into nyc-dev 2016-06-11 01:31:15 +00:00
TreeHugger Robot
5985e3f92f Merge "Temp fix to split header and position count behaviour for watches." into nyc-mr1-dev 2016-06-11 00:06:56 +00:00
Andrii Kulian
8d6ac26504 Reinflate primary action mode view after detach
When app is resized in multi-window mode we preserve the window along
with the decor view. If action mode view was shown before such config
change, its view is detached, but the mPrimaryActionModeView variable
is not cleared. So when action mode view is shown again after that it
thinks that its view is still alive.
This CL adds additional check to inflate new mPrimaryActionModeView
if it is not attached to any window.

Bug: 28971666
Change-Id: Ia8c24d4322be32e8b2c8967301beb3a4d889d501
2016-06-10 16:07:43 -07:00
Adam Lesinski
860e09ddce Merge \"BatteryStats: Fix read/write parcel order\" into nyc-dev
am: e8a442ccd6

Change-Id: I08f02adc6014ff9bcae60f60a091bba74695488d
2016-06-10 22:43:45 +00:00
Makoto Onuki
a1d38b3c95 Fix some exception messages and enhance unit tets
Bug 29275393

Change-Id: Idaa8564d41f86de2a2cbefa4ff3c08b89a3a6dd2
2016-06-10 15:32:26 -07:00
Adam Lesinski
e8a442ccd6 Merge "BatteryStats: Fix read/write parcel order" into nyc-dev 2016-06-10 22:29:15 +00:00
Adam Lesinski
67c134f849 BatteryStats: Fix read/write parcel order
Also moves discharge coulomb data to BATTERY_DISCHARGE_DATA checkin line.

Bug:29264326
Bug:28743761
Change-Id: I78881e166c11f40b2397e04d2cab8d5200c71eea
2016-06-10 15:24:16 -07:00
Andreas Gampe
bf06232f4d Otadexopt: Expose progress percentage
To be able to report progress of an A/B OTA dexopt, expose a
progress function that the script can query.

Bug: 25612095
Bug: 29223204
Change-Id: Ie8162946d18f6fa78649a40ad5d3949d31a181cd
2016-06-10 15:21:39 -07:00
Svetoslav Ganov
e33f613190 Fix permissions update for VrListenerService on user changes.
- Fixes a bug where we would not update the
overlay restrictions if the VR listener we are bound to
changes bug the VR enabled state doesn't.
- Also fixed a case where the notification listener access
and location permission were not granted/revoked for the
correct user. For example, if a vr activity in one user calls
a VR activity in another (possible for cross profiles) we end
up not revoking the special access for the vr service in the
first user. The notification listener setting was also updated
for the system user instead of the user for which we grant/revoke
specal access.
- Properly remove the overlay restrictions for the old user
if we transition from a vr actiivty in one user to a vr activity
in a profile of this user.

Bug: 29273985
Change-Id: Ib1de6f2f5445001ac61edca5c77ea3a066544307
2016-06-10 14:05:51 -07:00
Eino-Ville Talvala
2c21b5b651 Merge changes I069e2b7e,Ic5e9e58a into nyc-dev
am: f4de8dd77c

Change-Id: I439643be2fd5699f1a98d8ca15d14167ea3ffde1
2016-06-10 20:02:20 +00:00
Eino-Ville Talvala
f4de8dd77c Merge changes I069e2b7e,Ic5e9e58a into nyc-dev
* changes:
  Camera2: Fix error codes for CameraDevice.StateCallback.onError()
  Camera2: Protect MarshalRegistry against concurrent access
2016-06-10 19:44:04 +00:00
Michael Kwan
937035ef57 Temp fix to split header and position count behaviour for watches.
Bug: 29010414
Bug: 29244476
Change-Id: I5c8616304e7d44f423636612670d9187ad030679
2016-06-10 12:01:23 -07:00
John Reck
b8dac11e5a Merge \"Don\'t call surfaceCreated for just changed surfaces\" into nyc-dev
am: e4b1fb94e3

Change-Id: I488da6f9f779ddf64beb6ac12d1481d2bfd69821
2016-06-10 18:02:57 +00:00
John Reck
e4b1fb94e3 Merge "Don't call surfaceCreated for just changed surfaces" into nyc-dev 2016-06-10 17:46:54 +00:00
Eino-Ville Talvala
50eebe057b Camera2: Fix error codes for CameraDevice.StateCallback.onError()
Existing code assumed that ICameraDeviceCallbacks and
CameraDevice.StateCallback have the same error code values for matching
errors.

They do not.

Also remove duplicate error code definitions now present in the AIDL
file for ICameraDeviceCallbacks.

Bug: 29248704
Change-Id: I069e2b7ef3be7887634e128f1accb50b7558f3fd
2016-06-10 10:28:34 -07:00
Eino-Ville Talvala
4a2c7c5549 Camera2: Protect MarshalRegistry against concurrent access
Multiple CameraMetadataNative objects could be reading and writing
to the metadata marshaler registry simultaneously.

This can lead to an infinite loop in the HashMap in the worst case,
so add synchronization against this.

Bug: 29043079
Change-Id: Ic5e9e58a9333b99b4bea87bf790c9fbfadfbbea9
2016-06-10 10:28:34 -07:00
Tianjie Xu
9331178a6d Merge \"Collect statistics of source build version\" into nyc-dev
am: 8872a604b9

Change-Id: Ic920aced4f17c31a09bea55480f92252f20d728d
2016-06-10 17:23:25 +00:00
Tianjie Xu
8872a604b9 Merge "Collect statistics of source build version" into nyc-dev 2016-06-10 17:13:54 +00:00
TreeHugger Robot
0f8427773e Merge "fix prefix generation" into nyc-mr1-dev 2016-06-10 16:00:41 +00:00
Adam Lesinski
d499d79b07 Merge \"BatteryStats: Record fine grained battery discharge\" into nyc-dev
am: 094c40b2cc

Change-Id: Ie85fcfc2fa7aec5e7c15f57d605840c563c0e993
2016-06-10 02:21:54 +00:00
TreeHugger Robot
094c40b2cc Merge "BatteryStats: Record fine grained battery discharge" into nyc-dev 2016-06-10 02:12:23 +00:00
Adam Lesinski
69a983dfec Merge \"BatteryStats: Bump checkin format version to 18\" into nyc-dev
am: d75bc225ac

Change-Id: I70dbac4cb8002d8f216991ca78b18e9c1612eb89
2016-06-10 01:05:03 +00:00
Adam Lesinski
d75bc225ac Merge "BatteryStats: Bump checkin format version to 18" into nyc-dev 2016-06-10 00:53:44 +00:00
Adam Lesinski
b55d741c9a BatteryStats: Bump checkin format version to 18
Bug:28811636
Change-Id: If2229c438e60f20746c91bccbcaa6d72ca5f0802
2016-06-09 17:46:19 -07:00