Michael Wright
d61e63a174
Merge \\"N MR1 is API 25\\" into nyc-mr1-dev am: c9099d1a84
...
am: 92b73c654b
2016-07-01 15:48:14 +00:00
Michael Wright
92b73c654b
Merge \"N MR1 is API 25\" into nyc-mr1-dev
...
am: c9099d1a84
2016-07-01 15:40:50 +00:00
TreeHugger Robot
c9099d1a84
Merge "N MR1 is API 25" into nyc-mr1-dev
2016-07-01 15:34:14 +00:00
Lorenzo Colitti
38d40a5c06
Merge changes from topic \\'networkrequest_private\\' into nyc-mr1-dev am: 0317e03dc3
...
am: 09daa02022
2016-07-01 15:27:07 +00:00
Lorenzo Colitti
09daa02022
Merge changes from topic \'networkrequest_private\' into nyc-mr1-dev
...
am: 0317e03dc3
2016-07-01 15:20:21 +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
Martijn van Steenbergen
cac99ef166
Fix typos in View.AccessibilityDelegate Javadoc.
...
Change-Id: I83586da77d9c6d3bdc41188e7e9c671673227e9d
2016-07-01 10:35:24 +01:00
Yohei Yukawa
664e6d18db
Merge \\"Automatically grant URI permission as needed.\\" into nyc-mr1-dev am: d2e046a720
...
am: 1a932852d4
2016-07-01 01:28:47 +00:00
Yohei Yukawa
1a932852d4
Merge \"Automatically grant URI permission as needed.\" into nyc-mr1-dev
...
am: d2e046a720
2016-07-01 01:23:27 +00:00
Yohei Yukawa
d2e046a720
Merge "Automatically grant URI permission as needed." into nyc-mr1-dev
2016-07-01 01:09:56 +00:00
TreeHugger Robot
ca132ca6a1
Merge "Refactor WordIterator to avoid copying to internal buffers"
2016-07-01 00:03:59 +00:00
Felipe Leme
30635df7cb
Merge \\\"Removed warning when objects are added on wrong order.\\\" into nyc-dev am: a98e4512df am: 620936768f
...
am: a22f5a3fb4
2016-06-30 23:51:12 +00:00
Svetoslav Ganov
a22f5a3fb4
Merge \\"Removed warning when objects are added on wrong order.\\" into nyc-dev am: a98e4512df
...
am: 620936768f
2016-06-30 23:44:34 +00:00
Felipe Leme
7524b13642
Merge \"Removed warning when objects are added on wrong order.\" into nyc-dev
...
am: a98e4512df
2016-06-30 23:37:24 +00:00
Felipe Leme
620936768f
Merge \"Removed warning when objects are added on wrong order.\" into nyc-dev
...
am: a98e4512df
2016-06-30 23:37:13 +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
Adrian Roos
9e9608fec7
Merge \\\"Fix missing header text in notification groups\\\" into nyc-dev am: a275ec269f am: 1b7dbd9253
...
am: fa42bb3fa5
2016-06-30 23:23:23 +00: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
fa42bb3fa5
Merge \\"Fix missing header text in notification groups\\" into nyc-dev am: a275ec269f
...
am: 1b7dbd9253
2016-06-30 23:18:29 +00:00
Adrian Roos
1b7dbd9253
Merge \"Fix missing header text in notification groups\" into nyc-dev
...
am: a275ec269f
2016-06-30 23:07:40 +00:00
Adrian Roos
78f525b674
Merge \"Fix missing header text in notification groups\" into nyc-dev
...
am: a275ec269f
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
Roozbeh Pournader
b08a07165f
Refactor WordIterator to avoid copying to internal buffers
...
Previously, since the assumption was that the string is passed down
to ICU4C for the iteration to run, a window of text was copied and
maintained. But now, we can just pass an iterator to the input
CharSequence directly to ICU4J.
Bug: 21832431
Change-Id: Ife5dfdb1d90b3eda2817d4d75747b7abc34a2299
2016-06-30 15:29:38 -07:00
Makoto Onuki
b8e1286605
Merge \\"Start shortcuts as if publisher apps did using PendingIntent\\" into nyc-mr1-dev am: 60efbf2586
...
am: 20a9ca9311
2016-06-30 22:02:51 +00:00
Makoto Onuki
20a9ca9311
Merge \"Start shortcuts as if publisher apps did using PendingIntent\" into nyc-mr1-dev
...
am: 60efbf2586
2016-06-30 21:55:18 +00: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
eeabaa9394
Merge \\"Add counters for the automatic storage manager.\\" into nyc-mr1-dev am: d9f0e37dc1
...
am: f38d4bb413
2016-06-30 21:31:52 +00:00
Daniel Nishi
f38d4bb413
Merge \"Add counters for the automatic storage manager.\" into nyc-mr1-dev
...
am: d9f0e37dc1
2016-06-30 21:24:57 +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
9758d81dbe
Merge \\"Revert \\"Remove InputContentInfo#requestPermission()\\"\\" into nyc-mr1-dev am: 8acb1a7570
...
am: 359acdee5f
2016-06-30 19:41:43 +00:00
Yohei Yukawa
359acdee5f
Merge \"Revert \"Remove InputContentInfo#requestPermission()\"\" into nyc-mr1-dev
...
am: 8acb1a7570
2016-06-30 19:37:35 +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
2016-06-30 19:24:43 +00:00
Chad Brubaker
6d4f195f1a
Merge changes from topics 'handle-storage-update', 'action-storage-changed'
...
* changes:
Update trusted certificates when the trust store is changed
Deprecate ACTION_STORAGE_CHANGED
2016-06-30 19:22:19 +00:00
Yohei Yukawa
9047101977
Merge \\"Remove InputContentInfo#requestPermission()\\" into nyc-mr1-dev am: c80c64a97b
...
am: 854e6f8501
2016-06-30 18:40:27 +00:00
Yohei Yukawa
854e6f8501
Merge \"Remove InputContentInfo#requestPermission()\" into nyc-mr1-dev
...
am: c80c64a97b
2016-06-30 18:35:39 +00:00
Tim Murray
ef79f35c69
Merge \\"Add a new API to improve VR thread scheduling.\\" into nyc-mr1-dev am: 5e261441d3
...
am: 75c6078c8b
2016-06-30 18:28:14 +00:00
Yohei Yukawa
c80c64a97b
Merge "Remove InputContentInfo#requestPermission()" into nyc-mr1-dev
2016-06-30 18:21:48 +00:00
Srinath Sridharan
75c6078c8b
Merge \"Add a new API to improve VR thread scheduling.\" into nyc-mr1-dev
...
am: 5e261441d3
2016-06-30 18:19:47 +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
Siyamed Sinir
fcef4a3b62
Merge "Visibility fixes for text related tests."
2016-06-30 17:54:58 +00:00
Alan Viverette
b7c60cb24f
Merge \\\"Only clip PopupWindow in the vertical direction\\\" into nyc-dev am: 4b736ea56d am: a2beb44834
...
am: bb3fc63947
2016-06-30 17:51:01 +00:00
Alan Viverette
bb3fc63947
Merge \\"Only clip PopupWindow in the vertical direction\\" into nyc-dev am: 4b736ea56d
...
am: a2beb44834
2016-06-30 17:43:46 +00:00
Alan Viverette
6259ae4592
Merge \\\"Exclude children from excess space distribution when using largest child\\\" into nyc-dev am: 7705d5fd6e am: 650cc68f10
...
am: 0c359bad53
2016-06-30 17:36:40 +00:00
Alan Viverette
bf91103763
Merge \"Only clip PopupWindow in the vertical direction\" into nyc-dev
...
am: 4b736ea56d
2016-06-30 17:36:00 +00:00
Alan Viverette
a2beb44834
Merge \"Only clip PopupWindow in the vertical direction\" into nyc-dev
...
am: 4b736ea56d
2016-06-30 17:35:52 +00:00
Alan Viverette
0c359bad53
Merge \\"Exclude children from excess space distribution when using largest child\\" into nyc-dev am: 7705d5fd6e
...
am: 650cc68f10
2016-06-30 17:31:11 +00:00
