Dan Shi
1fee398b88
Change test type from InstrumentationTest to AndroidJUnitTest
...
Details about test configs changes are tracked in doc
https://docs.google.com/document/d/1EWUjJ7fjy8ge_Nk0YQbFdRp8DSHo3z6GU0R8jLgrAcw/edit#
Bug: 35882476
Test: local test
Change-Id: Ic3c4c7a9d29ef9d32a407f31cfc93c5e43650297
2017-03-31 16:02:33 -07:00
Android Build Merger (Role)
1336e93ce0
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: ddd95360a2 -s ours am: 8b35e8e64d -s ours"
2017-03-31 22:37:12 +00:00
TreeHugger Robot
56f91a3b58
Merge "Import translations. DO NOT MERGE"
2017-03-31 22:37:03 +00:00
Bill Yi
0b8dbba022
Merge "Import translations. DO NOT MERGE" into oc-dev am: ddd95360a2 -s ours
...
am: 8b35e8e64d -s ours
Change-Id: Idfe9a0140691a6e1347686ea8e663eb2376fc346
2017-03-31 22:36:15 +00:00
Bill Yi
8b35e8e64d
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: ddd95360a2 -s ours
Change-Id: Idaf543bfcbad9b802e10a78c29aa49cbf522ad1d
2017-03-31 22:30:45 +00:00
TreeHugger Robot
ddd95360a2
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-03-31 22:23:58 +00:00
Tyler Gunn
d2bec1b9a1
Merge "Add feature constants in Call Log provider to identify HD and WIFI calls." into oc-dev am: 9220ff1f5a
...
am: 9af9589937
Change-Id: Ieed863e86593c054e18db43ca354881e8834c322
2017-03-31 20:25:38 +00:00
Christopher Tate
798ba732eb
Merge "Add 'am start-foreground-service' shell command" into oc-dev am: 1157116b0c
...
am: 86ca9f3826
Change-Id: I2eda3f0d4e4e841b0a391c6734069df1f45ee1c7
2017-03-31 20:24:36 +00:00
Tyler Gunn
9af9589937
Merge "Add feature constants in Call Log provider to identify HD and WIFI calls." into oc-dev
...
am: 9220ff1f5a
Change-Id: I2bfe8a64253b73d26377985768d5a6aa4b470dc6
2017-03-31 20:21:19 +00:00
Christopher Tate
86ca9f3826
Merge "Add 'am start-foreground-service' shell command" into oc-dev
...
am: 1157116b0c
Change-Id: Iefc320f2bd053e98cd7ec4b4f3df3f1492b417e9
2017-03-31 20:20:11 +00:00
Tyler Gunn
9220ff1f5a
Merge "Add feature constants in Call Log provider to identify HD and WIFI calls." into oc-dev
2017-03-31 20:14:58 +00:00
TreeHugger Robot
1157116b0c
Merge "Add 'am start-foreground-service' shell command" into oc-dev
2017-03-31 20:14:51 +00:00
BIN ZHOU
b4df7b2d9e
Add feature constants in Call Log provider to identify HD and WIFI calls.
...
Makes use of existing features column in the provider.
Test: Manual
Bug: 35359461
Change-Id: I405893771a2dac2bb25a54065238917ac2d515c8
2017-03-31 13:09:08 -07:00
Chris Wren
3d082bdcb4
Merge "restore the title string un UsbDeviceManager" into oc-dev am: b0db4017e5
...
am: e04a449143
Change-Id: I29ac04a46804ba2de2acfaa065872f0e03f6f9c3
2017-03-31 20:04:14 +00:00
Brian Carlstrom
a9a2a0d3dc
Merge "Include likely IMEs in ANR dumping" into oc-dev am: 794eeebd55
...
am: bfe60bc563
Change-Id: Ifdf6ca1554284be5cd35397d6df9e4b1bac66a91
2017-03-31 20:03:13 +00:00
Chris Wren
e04a449143
Merge "restore the title string un UsbDeviceManager" into oc-dev
...
am: b0db4017e5
Change-Id: Ia3610251a9fa31b179bee8b5bae21dc24c3bed65
2017-03-31 19:58:59 +00:00
Brian Carlstrom
bfe60bc563
Merge "Include likely IMEs in ANR dumping" into oc-dev
...
am: 794eeebd55
Change-Id: Ia9dafd2603dc902b4d5d4cd8d3baa29465f52a53
2017-03-31 19:58:00 +00:00
Brian Carlstrom
b01edad83e
Merge "Add null check to InputMonitor.notifyANR" into oc-dev am: 15010f2bd1
...
am: 7bd17ef48f
Change-Id: I16260739e69c03929709063cdff74bce1182a44b
2017-03-31 19:57:39 +00:00
Brian Carlstrom
7bd17ef48f
Merge "Add null check to InputMonitor.notifyANR" into oc-dev
...
am: 15010f2bd1
Change-Id: I95e8ad62dbea783056e14780a4daeba44ff93406
2017-03-31 19:53:42 +00:00
Chris Wren
b0db4017e5
Merge "restore the title string un UsbDeviceManager" into oc-dev
2017-03-31 19:49:08 +00:00
Brian Carlstrom
794eeebd55
Merge "Include likely IMEs in ANR dumping" into oc-dev
2017-03-31 19:46:52 +00:00
Brian Carlstrom
15010f2bd1
Merge "Add null check to InputMonitor.notifyANR" into oc-dev
2017-03-31 19:46:18 +00:00
Chris Wren
a71b5918b0
restore the title string un UsbDeviceManager
...
Bug: 32584866
Test: make
Change-Id: I4e4dea064a1af194db5660b0765cc4c4b666584a
2017-03-31 15:39:12 -04:00
Sudheer Shanka
ced4c86bc7
Merge "Update default max time of waiting for network state to get updated." into oc-dev am: f2cd4371fe
...
am: 2fd55e29ce
Change-Id: I1556eace21bd73be9f057f699527afa25a2b8856
2017-03-31 19:12:38 +00:00
Sudheer Shanka
2fd55e29ce
Merge "Update default max time of waiting for network state to get updated." into oc-dev
...
am: f2cd4371fe
Change-Id: I8e11ab25744c48faa5831a0974bf6fb711482acf
2017-03-31 19:08:35 +00:00
Sudheer Shanka
f2cd4371fe
Merge "Update default max time of waiting for network state to get updated." into oc-dev
2017-03-31 19:03:12 +00:00
Sohani Rao
55359c13d7
Merge "Introduce Authentication Failure reason codes" into oc-dev am: 398b37539b
...
am: a3cd363361
Change-Id: Ifa2af1459104ac44d9b5933f95a10f551456fcbd
2017-03-31 19:00:41 +00:00
Sohani Rao
a3cd363361
Merge "Introduce Authentication Failure reason codes" into oc-dev
...
am: 398b37539b
Change-Id: I398f105602a12485282198df541cc6f4ef786bee
2017-03-31 18:55:37 +00:00
Sohani Rao
398b37539b
Merge "Introduce Authentication Failure reason codes" into oc-dev
2017-03-31 18:51:16 +00:00
Garfield Tan
0f04cf094a
Merge "Add flags for quick viewer to indicate capabilities of a document." into oc-dev am: f6d9507a00
...
am: cf3bc18f37
Change-Id: I8308f7bbb0ad5d496c3853bc4edc32851ca99a70
2017-03-31 18:16:08 +00:00
Garfield Tan
cf3bc18f37
Merge "Add flags for quick viewer to indicate capabilities of a document." into oc-dev
...
am: f6d9507a00
Change-Id: I331a447f0171c9eb3d3b564cfc170d5bf60e74b9
2017-03-31 18:11:08 +00:00
Garfield Tan
f6d9507a00
Merge "Add flags for quick viewer to indicate capabilities of a document." into oc-dev
2017-03-31 18:04:54 +00:00
Peter Qiu
d385b7b33a
Merge "SettingsLib: wifi: encapsulate Passpoint configuration in AccessPoint" into oc-dev am: 70c429d37a
...
am: 3c53fc41ac
Change-Id: Ifa9523dceddeeeef106bfdf1c88d09f8e7208176
2017-03-31 18:04:10 +00:00
Peter Qiu
3c53fc41ac
Merge "SettingsLib: wifi: encapsulate Passpoint configuration in AccessPoint" into oc-dev
...
am: 70c429d37a
Change-Id: I71e226d3e17474d2e10d768bb3be5eee86a55520
2017-03-31 18:00:02 +00:00
TreeHugger Robot
70c429d37a
Merge "SettingsLib: wifi: encapsulate Passpoint configuration in AccessPoint" into oc-dev
2017-03-31 17:54:17 +00:00
Peter Qiu
ced37dba7b
SettingsLib: wifi: encapsulate Passpoint configuration in AccessPoint
...
The configurations that are managed by "Saved Networks" page are
centered around the abstraction of AccessPoint. Since we will
need to manage Passpoint configuration in the "Saved Networks"
(for configuration removal), encapsulate necessary information
in an AccessPoint for a Passpoint configuration.
Bug: 34207710
Test: manual test
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Change-Id: Ide556f5ec6c4ef9e1f82016efe17dc9860f298de
2017-03-31 10:50:45 -07:00
Adrian Roos
1c8249622a
Merge "A11y: Prefer EXTRA_TITLE to ticker for status bar icon content description" into oc-dev am: f667aebe20
...
am: da11e9391b
Change-Id: Iee452be47d744cc1057e158d59a3e6e0e66e831a
2017-03-31 17:44:29 +00:00
Adrian Roos
da11e9391b
Merge "A11y: Prefer EXTRA_TITLE to ticker for status bar icon content description" into oc-dev
...
am: f667aebe20
Change-Id: Iae45c9efabc48d27d11211a63e50bf94abe98300
2017-03-31 17:39:40 +00:00
Mady Mellor
9933bee4ac
Merge "Update PIP dismiss to show scrim + info text at the bottom of the screen" into oc-dev am: 8565eab156
...
am: 722ec3df34
Change-Id: I40c533c72e0835c5f1e8f56820af9d9ea1d21f61
2017-03-31 17:39:28 +00:00
Mady Mellor
722ec3df34
Merge "Update PIP dismiss to show scrim + info text at the bottom of the screen" into oc-dev
...
am: 8565eab156
Change-Id: I6ea47f95853616bb9198e02606d62a57d25e993a
2017-03-31 17:35:28 +00:00
Adrian Roos
f667aebe20
Merge "A11y: Prefer EXTRA_TITLE to ticker for status bar icon content description" into oc-dev
2017-03-31 17:31:50 +00:00
Mady Mellor
8565eab156
Merge "Update PIP dismiss to show scrim + info text at the bottom of the screen" into oc-dev
2017-03-31 17:27:41 +00:00
Chris Wren
49ce49034f
Merge "standardize system notification IDs" into oc-dev am: 441162562b
...
am: 72eb5da93b
Change-Id: Icf0abd881615f16e85547b275edbf081d6ee1819
2017-03-31 17:21:33 +00:00
Chris Wren
72eb5da93b
Merge "standardize system notification IDs" into oc-dev
...
am: 441162562b
Change-Id: Idb39af001fefa77b6899c3c9d8816532b5e54dea
2017-03-31 17:16:30 +00:00
Chris Wren
441162562b
Merge "standardize system notification IDs" into oc-dev
2017-03-31 17:09:46 +00:00
TreeHugger Robot
62027f69c0
Merge "Add test configs to hwui tests"
2017-03-31 17:04:33 +00:00
Julia Reynolds
8e6cb82a1a
Merge "Rename badge icon method" into oc-dev am: ed8d07f213
...
am: 52e063ee15
Change-Id: If360b1c8a5f84c0be519cc8ce7e472c23608c202
2017-03-31 16:51:51 +00:00
Brian Carlstrom
7b0f2e82af
Add null check to InputMonitor.notifyANR
...
Followup to 7402ddf9b45efc9616676205534ce7b4fc3a13e6
Test: Start IME, induce ANR in Settings, verify /data/anr/traces.txt
Change-Id: I4ad1d48cc73ca1a4332414ff50a160c67979feef
Fixes: 36730136
2017-03-31 16:51:32 +00:00
Julia Reynolds
52e063ee15
Merge "Rename badge icon method" into oc-dev
...
am: ed8d07f213
Change-Id: I26f8b9cf46ebd30608bd038dde946e7139c9f25a
2017-03-31 16:41:27 +00:00
Evan Rosky
ef1ba7b10b
Merge "Prevent arrow keys from leaving editable TextViews" into oc-dev am: 27b0a55fab
...
am: 523faba79a
Change-Id: Icfcc66ae6bd344464cc67f4db183a814e2644ce8
2017-03-31 16:37:01 +00:00
