Dmitry Dementyev
e8f732a5db
Merge "Use invalid package names for special keys in AccountManager." into oc-dev am: e669ae438f
...
am: b05510f938
2017-04-27 23:42:28 +00:00
Jorim Jaggi
a88bacba17
Merge "Implement API council feedback for dismissKeyguard" into oc-dev am: 560324cfa0
...
am: 74b6192f8b
2017-04-27 23:30:45 +00:00
Sudheer Shanka
0e229d0066
Merge "Rename ActivityMonitor.onMatchIntent to onStartActivity." into oc-dev am: 7e7f7d526d
...
am: 241674dedd
2017-04-27 23:26:48 +00:00
Dmitry Dementyev
b05510f938
Merge "Use invalid package names for special keys in AccountManager." into oc-dev
...
am: e669ae438f
2017-04-27 23:25:28 +00:00
Jakub Pawlowski
b9a9727cb1
Merge "Bluetooth: Add constants to ScanResult" am: 369a94496c am: b6656f07e7 am: 493ae0da60
...
am: ebaa44db58
2017-04-27 23:22:44 +00:00
Jorim Jaggi
74b6192f8b
Merge "Implement API council feedback for dismissKeyguard" into oc-dev
...
am: 560324cfa0
2017-04-27 23:09:09 +00:00
Sudheer Shanka
241674dedd
Merge "Rename ActivityMonitor.onMatchIntent to onStartActivity." into oc-dev
...
am: 7e7f7d526d
2017-04-27 23:01:09 +00:00
Tima Vaisburd
74f35dd763
Merge "Hide getTextClassifier and setTextClassifier for WebView" into oc-dev am: 9c14b91aa9
...
am: 04f97ee8a6
2017-04-27 22:55:03 +00:00
Jakub Pawlowski
ebaa44db58
Merge "Bluetooth: Add constants to ScanResult" am: 369a94496c am: b6656f07e7
...
am: 493ae0da60
2017-04-27 22:52:34 +00:00
Tima Vaisburd
04f97ee8a6
Merge "Hide getTextClassifier and setTextClassifier for WebView" into oc-dev
...
am: 9c14b91aa9
2017-04-27 22:17:54 +00:00
TreeHugger Robot
e669ae438f
Merge "Use invalid package names for special keys in AccountManager." into oc-dev
2017-04-27 21:23:40 +00:00
Jakub Pawlowski
c7c01a2877
Bluetooth: Add constants to ScanResult
...
Add TX_POWER_NOT_PRESENT and PERIODIC_INTERVAL_NOT_PRESENT
Test: none
Bug: 37536707
Change-Id: Ia48a30f44a961c6e0babd17ecaed0eb93c98ecad
2017-04-27 21:03:46 +00:00
Jorim Jaggi
560324cfa0
Merge "Implement API council feedback for dismissKeyguard" into oc-dev
2017-04-27 20:57:11 +00:00
Sudheer Shanka
7e7f7d526d
Merge "Rename ActivityMonitor.onMatchIntent to onStartActivity." into oc-dev
2017-04-27 20:47:09 +00:00
Makoto Onuki
1bfe94164f
Merge "Change IMPORTANCE_PERCEPTIBLE_DEPRECATED to IMPORTANCE_PERCEPTIBLE_PRE_26" into oc-dev am: 301663a61b
...
am: 27521581fb
2017-04-27 20:32:27 +00:00
Makoto Onuki
27521581fb
Merge "Change IMPORTANCE_PERCEPTIBLE_DEPRECATED to IMPORTANCE_PERCEPTIBLE_PRE_26" into oc-dev
...
am: 301663a61b
2017-04-27 20:25:57 +00:00
Pavel Grafov
a4bc6bae4a
Merge "Use InetAddress instead of String in network events." into oc-dev am: 54e534d6e7
...
am: c3ae946f66
2017-04-27 20:24:11 +00:00
Tima Vaisburd
9c14b91aa9
Merge "Hide getTextClassifier and setTextClassifier for WebView" into oc-dev
2017-04-27 20:22:15 +00:00
Pavel Grafov
c3ae946f66
Merge "Use InetAddress instead of String in network events." into oc-dev
...
am: 54e534d6e7
2017-04-27 20:12:22 +00:00
Makoto Onuki
301663a61b
Merge "Change IMPORTANCE_PERCEPTIBLE_DEPRECATED to IMPORTANCE_PERCEPTIBLE_PRE_26" into oc-dev
2017-04-27 20:03:22 +00:00
TreeHugger Robot
54e534d6e7
Merge "Use InetAddress instead of String in network events." into oc-dev
2017-04-27 19:53:58 +00:00
Chad Brubaker
d65e8e8326
Merge "Allow apps to provide the Instant App installer extra information" into oc-dev am: a9d0e6b205
...
am: f4488dabd5
2017-04-27 19:51:45 +00:00
Chad Brubaker
f4488dabd5
Merge "Allow apps to provide the Instant App installer extra information" into oc-dev
...
am: a9d0e6b205
2017-04-27 19:41:06 +00:00
Chad Brubaker
a9d0e6b205
Merge "Allow apps to provide the Instant App installer extra information" into oc-dev
2017-04-27 19:30:57 +00:00
Dmitry Dementyev
cbe1bd1d42
Use invalid package names for special keys in AccountManager.
...
Bug: 37672088
Test: cts, manual.
Change-Id: I7fd40e0646a50f809b5c9b89dfe4242ceb00195d
2017-04-27 19:15:57 +00:00
Andrii Kulian
d1ef87c4aa
Merge "Hide onMovedToDisplay callback" into oc-dev am: bfe5aa23e8
...
am: a63c3863a3
2017-04-27 18:29:00 +00:00
Andrii Kulian
a63c3863a3
Merge "Hide onMovedToDisplay callback" into oc-dev
...
am: bfe5aa23e8
2017-04-27 18:19:32 +00:00
Andrii Kulian
bfe5aa23e8
Merge "Hide onMovedToDisplay callback" into oc-dev
2017-04-27 18:09:17 +00:00
Jeff Davidson
4898b704de
Merge "Rename getDataEnabled() to isDataEnabled()."
2017-04-27 18:03:33 +00:00
Pavel Grafov
a6ea92097c
Use InetAddress instead of String in network events.
...
This is a conservative change that converts strings to
InetAddress on the fly just before givint it to the client.
Also renamed getIpAddressesCount to getTotalResolvedAddressCount
to make it 1) harder to misuse it as getInetAddresses().length
2) more descriptive.
Bug: 37625453
Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/NetworkEventTest.java
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceOwnerTest#testNetworkLoggingWithSingleUser
Change-Id: I2a31dddd6874f1a629895e4dff105cf41984a775
2017-04-27 18:53:11 +01:00
Jorim Jaggi
f41e7664a2
Implement API council feedback for dismissKeyguard
...
Test: KeyguardLockedTests CTS
Change-Id: Ibc6923ebe8363644e9b52b2b53b45d918124f52d
Fixes: 37673408
2017-04-27 17:58:59 +02:00
George Mount
c4066d29b0
Merge "Address API council feedback." into oc-dev am: 4a71842dbd
...
am: b19b342466
2017-04-27 14:24:55 +00:00
George Mount
b19b342466
Merge "Address API council feedback." into oc-dev
...
am: 4a71842dbd
2017-04-27 14:18:10 +00:00
George Mount
4a71842dbd
Merge "Address API council feedback." into oc-dev
2017-04-27 14:06:16 +00:00
Narayan Kamath
47cfd4c0ea
Merge "Track libcore change 03e8c7dca78a95ccf719a7." into oc-dev am: 2e0e7f3c94
...
am: 32eb4022fd
2017-04-27 13:52:35 +00:00
Narayan Kamath
32eb4022fd
Merge "Track libcore change 03e8c7dca78a95ccf719a7." into oc-dev
...
am: 2e0e7f3c94
2017-04-27 13:43:50 +00:00
Narayan Kamath
2e0e7f3c94
Merge "Track libcore change 03e8c7dca78a95ccf719a7." into oc-dev
2017-04-27 13:30:35 +00:00
Victor Chang
e04abdcd1a
Merge "Add STATE_USER_SETUP_COMPLETE"
2017-04-27 10:57:32 +00:00
Joachim Sauer
ccac69e11a
Merge "Deprecate internal Calendar methods." into oc-dev
2017-04-27 10:49:46 +00:00
Tony Mak
217f6066e8
Merge "setAffiliationIds and getAffiliationIds uses set instead of list" into oc-dev am: 424dd39e25
...
am: d272847267
2017-04-27 10:38:59 +00:00
Tony Mak
d272847267
Merge "setAffiliationIds and getAffiliationIds uses set instead of list" into oc-dev
...
am: 424dd39e25
2017-04-27 09:49:14 +00:00
TreeHugger Robot
424dd39e25
Merge "setAffiliationIds and getAffiliationIds uses set instead of list" into oc-dev
2017-04-27 09:41:18 +00:00
Steve McKay
eebe305a52
Merge "Address API Council feedback." into oc-dev
...
am: f147688149
2017-04-27 06:33:19 +00:00
TreeHugger Robot
f147688149
Merge "Address API Council feedback." into oc-dev
2017-04-27 06:26:04 +00:00
Felipe Leme
f5c6ce029c
Merge "Autofill binding permission fixes." into oc-dev am: d915c42150
...
am: bd67d13bfc
2017-04-27 05:21:36 +00:00
Julia Reynolds
d6247427ac
Merge "Api updates" into oc-dev am: f84467e19f
...
am: 7ee513c27b
2017-04-27 05:15:11 +00:00
Felipe Leme
bd67d13bfc
Merge "Autofill binding permission fixes." into oc-dev
...
am: d915c42150
2017-04-27 05:11:38 +00:00
Julia Reynolds
7ee513c27b
Merge "Api updates" into oc-dev
...
am: f84467e19f
2017-04-27 05:04:18 +00:00
Tima Vaisburd
2240ea6448
Hide getTextClassifier and setTextClassifier for WebView
...
Bug: 37724053
Test: Not needed, these methods have not been implemented.
Change-Id: I43c97cb13e80eeb13d53123a22230d5934b8a60d
2017-04-26 21:59:12 -07:00
TreeHugger Robot
d915c42150
Merge "Autofill binding permission fixes." into oc-dev
2017-04-27 04:56:44 +00:00
