Commit Graph

64349 Commits

Author SHA1 Message Date
Android Build Merger (Role)
d0302f579b Merge "Merge \"Use proper lock when accessing the generation registry\" into nyc-dev am: dcf2e205bf" into nyc-mr1-dev 2016-07-07 01:26:13 +00:00
Svet Ganov
84954568db Merge \"Use proper lock when accessing the generation registry\" into nyc-dev
am: dcf2e205bf

Change-Id: I00b1a6aba01fd9155e4b0db17e9bd65d31425489
2016-07-07 01:25:04 +00:00
TreeHugger Robot
3a4408640a Merge "Switch network cycle calculation to use Calendar." into nyc-mr1-dev 2016-07-07 01:23:59 +00:00
Annie Chin
d58f07f58a Merge "Add callbacks to VoiceInteractionManagerService" into nyc-mr1-dev 2016-07-06 23:22:10 +00:00
Jeff Sharkey
f2bead5117 Switch network cycle calculation to use Calendar.
The older Time class is deprecated and doesn't handle edge cases
very well.  So migrate the cycle calculation logic to use the
long-standing and well-supported Calendar API.

Bug: 28689087
Change-Id: Ic1802b3f8556402f99bfea4cd625c35dfed81ac0
2016-07-06 17:15:33 -06:00
Michael Kwan
929c8f4a75 Merge "Allow preference theming to remove divider." into nyc-mr1-dev 2016-07-06 22:34:29 +00:00
TreeHugger Robot
d683945251 Merge "Don't cache external storage directories." into nyc-mr1-dev 2016-07-06 20:47:51 +00:00
Daniel Nishi
9459f93c97 Merge "Move the MIME type icon detection into the platform." into nyc-mr1-dev 2016-07-06 19:54:27 +00:00
Svet Ganov
51b839544b Use proper lock when accessing the generation registry
We use 'this' for synchronization in NameValueCache but some code
that accesses the generation registry uses 'this' in a different
context ending up syncing on the wrong instance. This is why
sync on this is just a bad idea.

bug:29956424

Change-Id: Ide2d4f07a5f40cb3f0e8f50e4c8de216d15a31ee
2016-07-06 19:52:36 +00:00
Andreas Gampe
6e16714c68 Frameworks/base: Refactor UserHandle and Environment a bit
Refactor slightly to forbid using myUserId in the zygote (uid == 0).
Also factor Environment to put user data (vs shared data) into its
own class, which should keep the page the shared data is on actually
shared between processes.

Bug: 29338430
Change-Id: I05d1306b57658a83299e38076171f56cb364ea80
2016-07-06 18:07:44 +00:00
Daniel Nishi
c29d2b0492 Move the MIME type icon detection into the platform.
This allows the MIME type icons to be used in other system apps.
In this instance, the StorageManager app needs to show file icons
for a given file. By moving the icon mapping into a static library,
we can avoid duplicating the mapping and resources.

Bug: 29826961
Change-Id: Ic2dc7970cc5a5ca430e33425eb9f1ecbd733fe9a
2016-07-06 10:57:06 -07:00
Robin Lee
da68f0614c Merge "Update isValidLockdownProfile to block PPTP" into nyc-mr1-dev 2016-07-06 15:57:23 +00:00
Erik Kline
4e37b70440 [net mgmt svc] add method to retrieve INetd reference
Bug: 21859053
Bug: 28135208
Change-Id: Idfb5ca65788ae8c7aea91f12d9d461686ad836d6
2016-07-06 19:32:01 +09:00
Robin Lee
bae6d820d2 Update isValidLockdownProfile to block PPTP
Since this isn't supported and it will take a framework update to make
it work.

Bug: 28807474
Change-Id: I12371134a1c51a53af26fe8c4db1f04b0f687abe
2016-07-06 09:41:05 +00:00
TreeHugger Robot
018a205824 Merge "IpConn metrics: use @IntDef" into nyc-mr1-dev 2016-07-05 14:39:47 +00:00
Hugo Benichi
cf6b12f50a IpConn metrics: use @IntDef
Change-Id: Iae23f04abd3d1a43e7217f4fd641cd5fa61a7a1b
2016-07-05 21:52:15 +09:00
Hugo Benichi
54756fdfd9 Merge "IpConn metrics: correctly read RA lifetimes" into nyc-mr1-dev 2016-07-05 12:25:55 +00:00
Hugo Benichi
176ed01a1f IpConn metrics: add dhcp transition times
This patch adds lifetime durations of DhcpClient states to
DhcpClientEvents.

To record the duration of a state, the event is now recorded when the
DhcpClient state machine exits that state.

In addition this patch removes event logging of StoppedState,
DhcpState and DhcpHaveLeaseState.

Change-Id: Ibd37b5e3070f35113b6b45942b1e1ff19c27a90b
2016-07-05 17:32:56 +09:00
Hugo Benichi
6ccd51a338 IpConn metrics: correctly read RA lifetimes
This patch
  - adds a Builder class for RaEvent.
  - uses this Builder class for correctly recording the minimum
    lifetime seen for every ICMP6 options tracked, instead of
    recording the last lifetime seen.
  - adds unit test coverage for RaEvent logging.

Change-Id: I6443932f5cf7a613a5c695c65a60eab01e60602a
2016-07-05 13:52:24 +09:00
Lorenzo Colitti
1ec11eb5bc Unbreak unregisterNetworkCallback.
http://ag/1194313 broke unregisterNetworkCallback because the
system does not parcel the type of the request back to the app.
So when the app calls unregisterNetworkCallback, the
NetworkRequest that's passed in does not have a type and thus
doesn't match the request in mNetworkRequests.

Fix this by parceling over the type as well.

This was not caught by the unit test because the unit test all
runs in the same process with no parceling.

Bug: 23113288
Change-Id: I58b2ed651b9bf5cbdcca5b25c3ca24db53cffdf1
2016-07-05 01:59:49 +09:00
Michael Kwan
908523014e Allow preference theming to remove divider.
Bug: 27962897
Change-Id: I6632f2a3c3d1290c472594f127ad33c9b85023f1
2016-07-02 19:31:32 -07:00
Andrii Kulian
5552dc341f Merge "Clarify documentation of Display#getSize()" into nyc-mr1-dev 2016-07-01 23:49:38 +00:00
Annie Chin
ecb9f3e9b8 Add callbacks to VoiceInteractionManagerService
Bug: 29582254

Change-Id: I548d01bd1c7e261b2d2e0afd606d964e5553124e
2016-07-01 13:00:09 -07:00
Andrii Kulian
5f57a3d6d8 Clarify documentation of Display#getSize()
Bug: 25945436
Change-Id: I8574faf56427f4a6fb7155c08e31ef1e0bdb2cfa
2016-07-01 12:41:39 -07:00
TreeHugger Robot
30efa24b11 Merge changes I38cff63b,Id3739bbc,If052cd8c into nyc-mr1-dev
* changes:
  Fix synchronization error for Seamless rotation.
  Disable seamless rotation while animating.
  Force CROSSFADE rotation when launching from double tap gesture.
2016-07-01 19:27:36 +00:00
Robert Carr
fd10cd1989 Force CROSSFADE rotation when launching from double tap gesture.
When activity transition triggers a rotation change, the starting
window will normally be the top window at the time we try
to select the window animation. However, these layout params won't
have the apps rotation animation set (as the client code will set that
on the real window, not the starting window). Eventually we would
like to add API to specify rotation animation via manifest to solve
this problem cleanly. In the mean time, we can force a specific rotation
animation from the double tap gesture, and clean up some camera
ugliness. We accomplish this by attaching an animation hint to
ActivityOptions.

Bug: 28838855
Change-Id: If052cd8cbae76651da43f3b4c590cd9dcc1afc0f
2016-07-01 11:05:40 -07:00
TreeHugger Robot
c9099d1a84 Merge "N MR1 is API 25" into nyc-mr1-dev 2016-07-01 15:34:14 +00:00
Lorenzo Colitti
0317e03dc3 Merge changes from topic 'networkrequest_private' into nyc-mr1-dev
* changes:
  Make the NetworkRequest list private to NetworkAgentInfo.
  Move the request type from NetworkRequestInfo to NetworkRequest.
2016-07-01 15:12:53 +00:00
Michael Wright
863ae3e51a N MR1 is API 25
Also, finalize resource IDs for N MR1

Bug: 29816674
Change-Id: Ie880adb2544f4e2e32b439fe975a68a3928e6fe5
2016-07-01 14:42:46 +01:00
Lorenzo Colitti
b35d40d4e2 Move the request type from NetworkRequestInfo to NetworkRequest.
This will allow us to simplify code that deals with
NetworkRequests outside ConnectivityService.

Bug: 23113288
Change-Id: I9b3a859d0c68cad73d7f6baa4b584d13ffd2ae36
2016-07-01 20:15:19 +09:00
Yohei Yukawa
d2e046a720 Merge "Automatically grant URI permission as needed." into nyc-mr1-dev 2016-07-01 01:09:56 +00:00
Felipe Leme
7524b13642 Merge \"Removed warning when objects are added on wrong order.\" into nyc-dev
am: a98e4512df

Change-Id: Ic93707d6cda6dbdeed851f216eedbd4333d483ae
2016-06-30 23:37:24 +00:00
Svetoslav Ganov
a98e4512df Merge "Removed warning when objects are added on wrong order." into nyc-dev 2016-06-30 23:28:59 +00:00
Yohei Yukawa
f3806f57a5 Automatically grant URI permission as needed.
With this CL, the system automatically grants a temporary URI permission
to the target application when the IME calls
InputConnection#commitContent() with
InputConnection#INPUT_CONTENT_GRANT_READ_URI_PERMISSION.  The temporary
permission will be revoked by any of the following events:
 - InputContentInfo#releasePermission() is explicitly called by the
   target application.
 - The target application returned false in
   InputConnection#commitContent().
 - All the InputContentInfo instances copied from the original one are
   GC-ed.

If we do not do this and there is an application that forgot to call
that method then there is no way for IME developers to prevent
permission denial from happening in the application except for relaxing
the default permission of the ContentProvider just because of such an
application.

Although application developers are still expected to explicitly call
InputContentInfo#{request,release}Permission(), forgetting to call
InputContentInfo#requestPermission() does not hurt the user anymore.

With this CL, calling InputContentInfo#requestPermission() after calling
InputContentInfo#releasePermission() is also allowed.

Bug: 29892936
Change-Id: Id955435dd2e72549ee7134f46b3c6951581694ad
2016-06-30 16:27:46 -07:00
Felipe Leme
7709041c99 Removed warning when objects are added on wrong order.
append() is used to optimized insertions in the array, but it must
preserve the order of the hashcode array; when it doesn't, it falls back
to append(), but it should not log a warning message

In particular, PendingIntentRecords might have different hashcodes
across different processes.

Fixes: 29912192
Change-Id: I0ab566249829ddb934fd51cf21399b68cb286bd5
2016-06-30 23:19:08 +00:00
Adrian Roos
78f525b674 Merge \"Fix missing header text in notification groups\" into nyc-dev
am: a275ec269f

Change-Id: Ida3c3f33c63aa904d34c864899ddc8aac0368394
2016-06-30 23:07:39 +00:00
Adrian Roos
9dfb78fab6 Fix missing header text in notification groups
Fixes a case where notification header text could go missing
if a notification view was recycled and previously had a header text.

Reapplying only hid the text without clearing it, so the extraction
logic thought it was still there and hid the text for the children
even though it was not showing for the parent.

Change-Id: I3f96e1e7bebb2f815020d278ad13b2b5d948e63c
Fixes: 29915184
2016-06-30 15:46:15 -07:00
Makoto Onuki
60efbf2586 Merge "Start shortcuts as if publisher apps did using PendingIntent" into nyc-mr1-dev 2016-06-30 21:45:05 +00:00
Daniel Nishi
d9f0e37dc1 Merge "Add counters for the automatic storage manager." into nyc-mr1-dev 2016-06-30 21:17:18 +00:00
Yohei Yukawa
8acb1a7570 Merge "Revert "Remove InputContentInfo#requestPermission()"" into nyc-mr1-dev 2016-06-30 19:30:21 +00:00
Yohei Yukawa
79d1c75a3f Revert "Remove InputContentInfo#requestPermission()"
This reverts commit c4b8f36de5.

Having InputContentInfo#requestPermission() should not hurt developers,
but we can polish the behavior in a subsequent CL without changing
the API.

Bug: 29450031
Bug: 29892936
Change-Id: I1b43c19417b643d0c269af860db2d309b73a90d5
2016-06-30 19:24:43 +00:00
Yohei Yukawa
c80c64a97b Merge "Remove InputContentInfo#requestPermission()" into nyc-mr1-dev 2016-06-30 18:21:48 +00:00
Tim Murray
5e261441d3 Merge "Add a new API to improve VR thread scheduling." into nyc-mr1-dev 2016-06-30 18:05:57 +00:00
Alan Viverette
a2beb44834 Merge \"Only clip PopupWindow in the vertical direction\" into nyc-dev
am: 4b736ea56d

Change-Id: Idf5aedfb2f19595b8317c7dca1640ff0caf31696
2016-06-30 17:35:52 +00:00
Alan Viverette
4b736ea56d Merge "Only clip PopupWindow in the vertical direction" into nyc-dev 2016-06-30 17:24:22 +00:00
Alan Viverette
650cc68f10 Merge \"Exclude children from excess space distribution when using largest child\" into nyc-dev
am: 7705d5fd6e

Change-Id: I747b4dab5bfc31b2461b445d1d983ac95a05693d
2016-06-30 17:19:41 +00:00
Alan Viverette
9705fa0602 Only clip PopupWindow in the vertical direction
Bug: 29865091
Change-Id: Ic4e3b50571034f341aff2c2fbf2c349342622448
2016-06-30 13:17:26 -04:00
TreeHugger Robot
7705d5fd6e Merge "Exclude children from excess space distribution when using largest child" into nyc-dev 2016-06-30 17:07:07 +00:00
Srinath Sridharan
e535a5827b Add a new API to improve VR thread scheduling.
Adds a new API that enables device-specific scheduler optimizations for
latency-sensitive VR threads.

BUG: 29163534
Change-Id: I58d7be0eb266eca452c804cd07004784fb7daf2b
2016-06-30 10:03:46 -07:00
Yohei Yukawa
c4b8f36de5 Remove InputContentInfo#requestPermission()
It turns out that requiring editor authors to call
InputContentInfo#requestPermission() as needed is just confusing and can
cause compatibility issues, because if an editor author forgot to call
that method then there would be no way for IME developers to prevent
permission denial except for relaxing the default permission of the
ContentProvider just because of such an application. This is not what we
want to see.

My conclusion is that the system should automatically call
InputContentInfo#requestPermission() (or do any equivalent operation)
when InputConnection#INPUT_CONTENT_GRANT_READ_URI_PERMISSION is
specified, like we have done in Context#startActivity().

With this CL, the system automatically grants a temporary URI permission
to the target application when the IME calls
InputConnection#commitContent() with
InputConnection#INPUT_CONTENT_GRANT_READ_URI_PERMISSION, and the
temporary permission will be revoked by any of the following events:
 - InputContentInfo#releasePermission() is explicitly called by the
   target application.
 - The target application returned false in
   InputConnection#commitContent().
 - All the InputContentInfo instances copied from the original one are
   GC-ed.

Bug: 29450031
Bug: 29892936
Change-Id: I37fb744e4d3d1c59177fb0a9be4ef5c325c9a39f
2016-06-30 09:32:54 -07:00