Commit Graph

68282 Commits

Author SHA1 Message Date
Felipe Leme
30635df7cb Merge \\\"Removed warning when objects are added on wrong order.\\\" into nyc-dev am: a98e4512df am: 620936768f
am: a22f5a3fb4

Change-Id: I744e2febd16c65c58b7313e704d26d03adc6be9c
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

Change-Id: I6986568b24bb4122452314d412b0f3d6422c61b4
2016-06-30 23:44:34 +00:00
Felipe Leme
620936768f Merge \"Removed warning when objects are added on wrong order.\" into nyc-dev
am: a98e4512df

Change-Id: Ibfa5a20731caae48c7961ab0452a72d7bff34cf0
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
Adrian Roos
9e9608fec7 Merge \\\"Fix missing header text in notification groups\\\" into nyc-dev am: a275ec269f am: 1b7dbd9253
am: fa42bb3fa5

Change-Id: Ie9da99d8a593dad326cb3b90e989113c66f5ceba
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

Change-Id: I007196bd1e93e3a89768b58f688e9a600694174f
2016-06-30 23:18:29 +00:00
Adrian Roos
1b7dbd9253 Merge \"Fix missing header text in notification groups\" into nyc-dev
am: a275ec269f

Change-Id: Ib2dc310b57756218d0851d7aff6a0ea183714f5d
2016-06-30 23:07:40 +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
b8e1286605 Merge \\"Start shortcuts as if publisher apps did using PendingIntent\\" into nyc-mr1-dev am: 60efbf2586
am: 20a9ca9311

Change-Id: I3bb569bb53b95176dc5e3b19f4122cf75511ac1e
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

Change-Id: If43a09cd1580edb318404f56459b8557b69b7d5a
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

Change-Id: Ia595b77f85f4b665cf7b20930544f046ea22b919
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

Change-Id: I00bcd2808aba694d66f1db689acebea26ed5eeee
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

Change-Id: Ia55a7e5095f93cb8f37edca65d2206fbf54316f3
2016-06-30 19:41:43 +00:00
Yohei Yukawa
359acdee5f Merge \"Revert \"Remove InputContentInfo#requestPermission()\"\" into nyc-mr1-dev
am: 8acb1a7570

Change-Id: If7fab0527a3d4f671985a663fc6aaf808d527ace
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.

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
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

Change-Id: Ia84ebe07d1abf469ed461aa524c38ffa76a5ea53
2016-06-30 18:40:27 +00:00
Yohei Yukawa
854e6f8501 Merge \"Remove InputContentInfo#requestPermission()\" into nyc-mr1-dev
am: c80c64a97b

Change-Id: Iaaf2b610852510e604c482568c0ef1dc6495e179
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

Change-Id: Ic101c2d17e98fcb1cc2d6e3cccebfb6e378f9914
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

Change-Id: Ie7c734ca22abad05a4f0800a1dba9553eb7cbfef
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

Change-Id: I1ae838346c9125d08987dee62171619d6c96e96b
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

Change-Id: I554dcbd9eb011d84a61d49b0d48818d1e9905c00
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

Change-Id: I116d4bd532751159c59f8178dead7503e562af85
2016-06-30 17:36:40 +00:00
Alan Viverette
bf91103763 Merge \"Only clip PopupWindow in the vertical direction\" into nyc-dev
am: 4b736ea56d

Change-Id: Ic10c4641d90f06b52d34285e42c35ae744f823eb
2016-06-30 17:36:00 +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
0c359bad53 Merge \\"Exclude children from excess space distribution when using largest child\\" into nyc-dev am: 7705d5fd6e
am: 650cc68f10

Change-Id: I490421dd7f13deda634b669ca7b7bd7a51d2bfdf
2016-06-30 17:31:11 +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
176f9cb656 Merge \"Exclude children from excess space distribution when using largest child\" into nyc-dev
am: 7705d5fd6e

Change-Id: I9a478a5dd666c8c938206e888065dbec976a9e82
2016-06-30 17:19:43 +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
Chad Brubaker
c72875b01e Update trusted certificates when the trust store is changed
This CL flushes the trusted cert cache of all active Network Security
Configs and their TrustManagers. Previously CA addition mostly worked
however removed CAs would remain cached in the X509TrustManager causing
the removed CA to still be trusted.

Change-Id: I0f5fd39932f8f8ed3ec5dfd088a82e982b366c43
2016-06-30 09:23:23 -07:00
Alan Viverette
070b22bdee Exclude children from excess space distribution when using largest child
Preserves API 23 behavior.

Bug: 29872769
Change-Id: I514cde81dcca4d78238f407251805cced4c0bea1
2016-06-30 11:15:36 -04:00
Hugo Benichi
88a9b54cdf Merge changes Ia28652e0,Id2eaafdc,I9c4c8286 into nyc-mr1-dev am: f5e3481951
am: 0664017da0

Change-Id: I75a518b8909e5cd85c7554ceaa11dc7519717075
2016-06-30 14:17:41 +00:00
Hugo Benichi
0664017da0 Merge changes Ia28652e0,Id2eaafdc,I9c4c8286 into nyc-mr1-dev
am: f5e3481951

Change-Id: Ic853ff8e8e1745821627e796d22daea227bafca2
2016-06-30 14:12:13 +00:00
TreeHugger Robot
f5e3481951 Merge changes Ia28652e0,Id2eaafdc,I9c4c8286 into nyc-mr1-dev
* changes:
  Record events for RA option lifetimes
  Log RA listening statistics
  Log events at APF program generation
2016-06-30 14:03:22 +00:00
Tobias Thierer
2df6976bb1 Merge \\\\"Changes for upgrade to OkHttp 2.7.5\\\\" am: a31247bd8d am: f6bcab7f97 am: 6b473f7b67
am: 847fe1668e

Change-Id: I02fe28e773df3b328be8c7ea26b0df065014188a
2016-06-30 13:12:46 +00:00
Tobias Thierer
847fe1668e Merge \\\"Changes for upgrade to OkHttp 2.7.5\\\" am: a31247bd8d am: f6bcab7f97
am: 6b473f7b67

Change-Id: I3a0dc1da2ee96d71c38cab727141efcb686627e1
2016-06-30 13:04:52 +00:00
Tobias Thierer
6b473f7b67 Merge \\"Changes for upgrade to OkHttp 2.7.5\\" am: a31247bd8d
am: f6bcab7f97

Change-Id: I7a1c9838a22cb7e8228e77bde68283fda57c83d6
2016-06-30 12:59:22 +00:00
Tobias Thierer
f6bcab7f97 Merge \"Changes for upgrade to OkHttp 2.7.5\"
am: a31247bd8d

Change-Id: Id79249756929a61dca374f9f1d43d0ea9e6b1280
2016-06-30 12:49:47 +00:00
Hugo Benichi
cfbf7414a1 Record events for RA option lifetimes
This patch defines a new android.net.metrics.RaEvent class carrying
lifetime values contained in RA packets. RaEvent are recorded when
ApfFilter processes a new RA for which there is no match.

Example:
ConnectivityMetricsEvent(15:39:39.808, 0, 0): RaEvent(lifetimes: router=3600s, prefix_valid=2592000s, prefix_preferred=604800s, route_info=-1s, dnssl=-1s, rdnss=3600s)

Change-Id: Ia28652e03ed442d5f2a686ef5b3fafbcb77c503a
2016-06-30 18:26:39 +09:00