Alan Viverette
3709761c9f
Merge "Automatic casts for more findViewById implementations" into oc-dev am: 7458ea3827
...
am: ee4b52afd8
Change-Id: Ie5ebcf1156e31da0b76d8f053a3c23f91e8ea7b9
2017-04-05 14:05:08 +00:00
Alan Viverette
ee4b52afd8
Merge "Automatic casts for more findViewById implementations" into oc-dev
...
am: 7458ea3827
Change-Id: I7c77634f1a5b2551830796118e1fe69d389d6884
2017-04-05 13:58:51 +00:00
Alan Viverette
7458ea3827
Merge "Automatic casts for more findViewById implementations" into oc-dev
2017-04-05 13:54:51 +00:00
Artem Iglikov
06d6b4d9b0
Merge "Rename IBackupManagerService to BackupManagerServiceInterface."
2017-04-05 12:17:55 +00:00
Alejandro Fernández
0496e31bd0
Merge "Updating javadoc string for DevicePolicyManager.EXTRA_PROVISIONING_SUPPORT_URL to indicate that only HTTPS urls are supported." into oc-dev am: 8d41ad08c0
...
am: 91266901dc
Change-Id: I22b145e575d20e367fcab7d0d6b8aaa0d142d732
2017-04-05 11:36:30 +00:00
Alejandro Fernández
91266901dc
Merge "Updating javadoc string for DevicePolicyManager.EXTRA_PROVISIONING_SUPPORT_URL to indicate that only HTTPS urls are supported." into oc-dev
...
am: 8d41ad08c0
Change-Id: I2a0f80a5da207243aa39c6d19e0743261f655f62
2017-04-05 11:31:29 +00:00
TreeHugger Robot
8d41ad08c0
Merge "Updating javadoc string for DevicePolicyManager.EXTRA_PROVISIONING_SUPPORT_URL to indicate that only HTTPS urls are supported." into oc-dev
2017-04-05 11:25:31 +00:00
Neil Fuller
e38c57c9b8
Merge "Update to latest tzdata / switch back to zones.tab" into oc-dev am: 0a49354820
...
am: 167cee4226
Change-Id: I084031b61037afa442a8e22ed1d8c52aee6c9a21
2017-04-05 10:44:31 +00:00
Neil Fuller
167cee4226
Merge "Update to latest tzdata / switch back to zones.tab" into oc-dev
...
am: 0a49354820
Change-Id: I2d5a0d65ecb2da43f4da92cb56f7f416a855ef3a
2017-04-05 10:39:28 +00:00
Neil Fuller
0a49354820
Merge "Update to latest tzdata / switch back to zones.tab" into oc-dev
2017-04-05 10:33:50 +00:00
Seigo Nonaka
815c5b23ce
Merge "Pass weight/italic pair instead of style." into oc-dev am: b4e3b344fa
...
am: 97b35a7089
Change-Id: Id75281df282cf6f0b77def2c7cffcc88ef92c417
2017-04-05 10:19:10 +00:00
Seigo Nonaka
97b35a7089
Merge "Pass weight/italic pair instead of style." into oc-dev
...
am: b4e3b344fa
Change-Id: I9d430af9489878fd0c7eb8d26dce186a13059450
2017-04-05 10:12:26 +00:00
TreeHugger Robot
b4e3b344fa
Merge "Pass weight/italic pair instead of style." into oc-dev
2017-04-05 10:04:52 +00:00
Felipe Leme
71ddd72f60
Merge "Temporarily hardcoded dimensions of autofill authentication UI." into oc-dev am: 24bac61498
...
am: 505729c509
Change-Id: Iba5d5ca47e649bb08f2573872f1e5770f2159a74
2017-04-05 04:38:37 +00:00
Felipe Leme
505729c509
Merge "Temporarily hardcoded dimensions of autofill authentication UI." into oc-dev
...
am: 24bac61498
Change-Id: Ifb07238314f220ee97f1677e2005ac00a613c1e2
2017-04-05 04:34:36 +00:00
Felipe Leme
24bac61498
Merge "Temporarily hardcoded dimensions of autofill authentication UI." into oc-dev
2017-04-05 04:29:24 +00:00
Wale Ogunwale
6a24cb89e8
Merge "Disable presubmit for ActivityRecordTests" into oc-dev am: ef3874ba91
...
am: 60366d2223
Change-Id: I71ea508d4ad4401ff17800faa1cc0ef4345df7e8
2017-04-05 03:44:33 +00:00
Wale Ogunwale
60366d2223
Merge "Disable presubmit for ActivityRecordTests" into oc-dev
...
am: ef3874ba91
Change-Id: Ib2ec81465005ac046e6ed622bf2f1f92d463c284
2017-04-05 03:40:04 +00:00
Wale Ogunwale
ef3874ba91
Merge "Disable presubmit for ActivityRecordTests" into oc-dev
2017-04-05 03:34:07 +00:00
Wale Ogunwale
4cb9b96d59
Disable presubmit for ActivityRecordTests
...
Failing in CI
Test: ActivityRecordTests
Bug: 36916522
Change-Id: Id5571b722cc5c14f2897fcc65d52d35bf4a78105
2017-04-04 20:30:18 -07:00
Christopher Tate
e0bb4cb9c2
Merge "Track pending job latency" into oc-dev am: 0704a9e56a
...
am: e5d32e4c19
Change-Id: Iad86ac4822f82e216b6bf8c6a8c98a59c43d5d11
2017-04-05 02:54:58 +00:00
Christopher Tate
e5d32e4c19
Merge "Track pending job latency" into oc-dev
...
am: 0704a9e56a
Change-Id: Iff9894317a65994ff823055daff6b5bda6487978
2017-04-05 02:50:56 +00:00
TreeHugger Robot
0704a9e56a
Merge "Track pending job latency" into oc-dev
2017-04-05 02:45:34 +00:00
Conrad Chen
899ee0fe08
Merge "TIF: protect PARENTAL_CONTROLS_ENABLED_CHANGED broadcast" into oc-dev am: 044eeecc1d
...
am: 0cc563d102
Change-Id: I48137a26231d6d12db687154e65ad339431da443
2017-04-05 02:29:56 +00:00
Conrad Chen
0cc563d102
Merge "TIF: protect PARENTAL_CONTROLS_ENABLED_CHANGED broadcast" into oc-dev
...
am: 044eeecc1d
Change-Id: I4caef36d3cee02d8912cfa7e02681fb404007567
2017-04-05 02:25:31 +00:00
TreeHugger Robot
044eeecc1d
Merge "TIF: protect PARENTAL_CONTROLS_ENABLED_CHANGED broadcast" into oc-dev
2017-04-05 02:20:25 +00:00
Felipe Leme
a728bd47b6
Merge "Adds a config for default autofill service." into oc-dev am: 045c71f1be
...
am: 87440e9c84
Change-Id: I0ff34bac471e5b46bee056db8bd8586a06e6f792
2017-04-05 02:06:35 +00:00
Felipe Leme
87440e9c84
Merge "Adds a config for default autofill service." into oc-dev
...
am: 045c71f1be
Change-Id: I3f92aff715d9a9a9e7d2c96f6eb60f7b86e9b9d3
2017-04-05 02:01:36 +00:00
TreeHugger Robot
045c71f1be
Merge "Adds a config for default autofill service." into oc-dev
2017-04-05 01:52:55 +00:00
Jean-Michel Trivi
b3f2892d27
Merge "Audio focus: duck new players during the ducked phase" into oc-dev am: a6c7f413f8
...
am: 63f2ec7881
Change-Id: Ia9c74315410a761e0c88330dab744c21c1e729e4
2017-04-05 01:51:52 +00:00
Jean-Michel Trivi
63f2ec7881
Merge "Audio focus: duck new players during the ducked phase" into oc-dev
...
am: a6c7f413f8
Change-Id: Icefeba66e1bdda26d2e89d2087dd251c0003e2eb
2017-04-05 01:46:50 +00:00
Sam Lin
cae17520fb
Merge "Add a feature flag for CTS." into oc-dev am: 9ff3ec4872
...
am: 4a4b6b6211
Change-Id: I8c59cbd4140ae6c449f715588cbba6540577eb0d
2017-04-05 01:43:49 +00:00
TreeHugger Robot
a6c7f413f8
Merge "Audio focus: duck new players during the ducked phase" into oc-dev
2017-04-05 01:40:17 +00:00
Sam Lin
4a4b6b6211
Merge "Add a feature flag for CTS." into oc-dev
...
am: 9ff3ec4872
Change-Id: I1b2e8026cf2db083fb17ab03d0e1972addffdbbb
2017-04-05 01:37:26 +00:00
Sam Lin
9ff3ec4872
Merge "Add a feature flag for CTS." into oc-dev
2017-04-05 01:29:20 +00:00
Mathias Agopian
fb515c1fdd
Merge "Remove useless GraphicBuffer() constructor" into oc-dev am: 810e018e24
...
am: dd1da2dcc1
Change-Id: I97c824bee05e693e488e2f63f02fe6b1a1acaf31
2017-04-05 00:59:34 +00:00
Adam Powell
5b4cd6c52a
Merge "Don't crash when passing null to requestChildFocus" into oc-dev am: df50b64860
...
am: 3da2903a18
Change-Id: I7d6a8e541308aba1ca67381f1a0fc070d627938f
2017-04-05 00:54:20 +00:00
Todd Kennedy
0dce786e5b
Merge "Don't broadcast PACKAGE_REMOVED for InstantApps" into oc-dev am: b28e1e68d2
...
am: 33f6353479
Change-Id: I9d8ee046726d0be1d9ca5344aa80966f2af914ed
2017-04-05 00:53:20 +00:00
Mathias Agopian
dd1da2dcc1
Merge "Remove useless GraphicBuffer() constructor" into oc-dev
...
am: 810e018e24
Change-Id: I630b623bc188301bc65e865f0298031ed9425cec
2017-04-05 00:52:39 +00:00
Adam Powell
3da2903a18
Merge "Don't crash when passing null to requestChildFocus" into oc-dev
...
am: df50b64860
Change-Id: I77afb7ee544c08cdc927b0b2e66aa3f229a72892
2017-04-05 00:50:12 +00:00
Hall Liu
f760757327
Merge "Add @TestApi annotations to CS-side RTT APIs for CTS" am: f6f3c16dfb am: 6689b57b66 am: bd2cf664ca
...
am: 7efa3442cc
Change-Id: Ibd70f317885284fa36e0bc84a231a58e6c004abb
2017-04-05 00:47:54 +00:00
Todd Kennedy
33f6353479
Merge "Don't broadcast PACKAGE_REMOVED for InstantApps" into oc-dev
...
am: b28e1e68d2
Change-Id: Id73d7aa14cbb20fe335270fbd2f05a8ed5606eb9
2017-04-05 00:45:56 +00:00
Mathias Agopian
810e018e24
Merge "Remove useless GraphicBuffer() constructor" into oc-dev
2017-04-05 00:42:58 +00:00
TreeHugger Robot
df50b64860
Merge "Don't crash when passing null to requestChildFocus" into oc-dev
2017-04-05 00:42:38 +00:00
Keun-young Park
b176e7c382
Merge "show different timing log for shutdown animation" into oc-dev am: 0e59ab0408
...
am: 3d9383aaa1
Change-Id: I82b9e0994aa1997588476f63e6f7181d155e1dee
2017-04-05 00:41:14 +00:00
Hall Liu
7efa3442cc
Merge "Add @TestApi annotations to CS-side RTT APIs for CTS" am: f6f3c16dfb am: 6689b57b66
...
am: bd2cf664ca
Change-Id: I22bd2201b0cc2b3bcbf8d1eb740a91485735d03f
2017-04-05 00:40:22 +00:00
Badhri Jagan Sridharan
9ea110f75d
Merge "Pass the right index to query the descriptors"
2017-04-05 00:39:30 +00:00
TreeHugger Robot
b28e1e68d2
Merge "Don't broadcast PACKAGE_REMOVED for InstantApps" into oc-dev
2017-04-05 00:37:52 +00:00
Christopher Tate
7234fc6fef
Track pending job latency
...
Timestamp jobs being marked 'pending' and 'active,' so we can then report their
pending latency in dumpsys.
Bug 35385393
Test: N/A
Change-Id: I3d981fbc7fbe6abdf30da3f86d88d3733b797f51
2017-04-05 00:36:56 +00:00
Keun-young Park
3d9383aaa1
Merge "show different timing log for shutdown animation" into oc-dev
...
am: 0e59ab0408
Change-Id: If511a7732730cc3a15c21ab716083417d9d46728
2017-04-05 00:34:19 +00:00