Abodunrinwa Toki
c1116bc55b
Merge "Fix TextClassifier logging." into pi-dev am: 1c60953f9d
...
am: c2aa28895a
2018-05-11 13:40:26 -07:00
Todd Kennedy
f6f2f50745
Merge changes from topic "b_78809704" into pi-dev am: 92b64bb1bb
...
am: f08b40642a
2018-05-11 11:59:39 -07:00
Mrten Kongstad
44a1a24da1
OMS: rebase settings when overlays update am: 2f1944bf0e
...
am: 0ddacd34de
2018-05-11 11:55:48 -07:00
Abodunrinwa Toki
c2aa28895a
Merge "Fix TextClassifier logging." into pi-dev
...
am: 1c60953f9d
2018-05-11 11:54:47 -07:00
TreeHugger Robot
1c60953f9d
Merge "Fix TextClassifier logging." into pi-dev
2018-05-11 18:29:31 +00:00
Todd Kennedy
f08b40642a
Merge changes from topic "b_78809704" into pi-dev
...
am: 92b64bb1bb
2018-05-11 11:15:10 -07:00
Jason Monk
196e8024a0
Merge "Allow onGetSliceDescendants to be slow" into pi-dev am: 02b9592ff1
...
am: 16db9b96bf
2018-05-11 11:10:30 -07:00
Mrten Kongstad
0ddacd34de
OMS: rebase settings when overlays update
...
am: 2f1944bf0e
2018-05-11 11:09:25 -07:00
Todd Kennedy
92b64bb1bb
Merge changes from topic "b_78809704" into pi-dev
...
* changes:
OMS: teach the OMS about static RROs
OMS: rebase settings when overlays update
2018-05-11 17:44:53 +00:00
Jason Monk
16db9b96bf
Merge "Allow onGetSliceDescendants to be slow" into pi-dev
...
am: 02b9592ff1
2018-05-11 10:37:59 -07:00
TreeHugger Robot
02b9592ff1
Merge "Allow onGetSliceDescendants to be slow" into pi-dev
2018-05-11 17:21:28 +00:00
Bo Zhu
f7e7b1d375
Merge "Revert "Revert "Change the root of trust for CryptAuth Vault Service""" into pi-dev am: 90dbb0ed72
...
am: 542dbb9734
2018-05-11 10:08:47 -07:00
Bo Zhu
542dbb9734
Merge "Revert "Revert "Change the root of trust for CryptAuth Vault Service""" into pi-dev
...
am: 90dbb0ed72
2018-05-11 09:59:59 -07:00
Bo Zhu
90dbb0ed72
Merge "Revert "Revert "Change the root of trust for CryptAuth Vault Service""" into pi-dev
2018-05-11 16:46:16 +00:00
Jason Monk
a66dfee8d0
Allow onGetSliceDescendants to be slow
...
Because sometimes it needs to be
Test: existing tests
Bug: 79132845
Bug: 77873463
Change-Id: I93aa8553c48c856bf96c347a229be6e770751708
2018-05-11 08:23:59 -07:00
Bo Zhu
bd7879ce3e
Revert "Revert "Change the root of trust for CryptAuth Vault Service""
...
This reverts commit be4f735cb1http://ag/3983388 that was reverted. The server side change has been deployed now.
Bug: 78920513
Change-Id: If676799176ecf90fd51a97027a9ff83bec5d4bed
2018-05-11 05:11:11 +00:00
Brad Stenning
4a87b9f0cb
Merge "Add a path to allow detection of task changes to the top of the ActivityView" into pi-dev am: 47a8ecce90
...
am: 2b557bebaa
2018-05-10 20:29:49 -07:00
Christopher Tate
331cf5af98
Merge "Document system activity intents that may not be implemented" into pi-dev am: f9dbd76be3
...
am: b11cfdbb68
2018-05-10 20:15:41 -07:00
Brad Stenning
2b557bebaa
Merge "Add a path to allow detection of task changes to the top of the ActivityView" into pi-dev
...
am: 47a8ecce90
2018-05-10 20:14:18 -07:00
Christopher Tate
b11cfdbb68
Merge "Document system activity intents that may not be implemented" into pi-dev
...
am: f9dbd76be3
2018-05-10 20:05:42 -07:00
TreeHugger Robot
47a8ecce90
Merge "Add a path to allow detection of task changes to the top of the ActivityView" into pi-dev
2018-05-11 02:45:25 +00:00
Christopher Tate
72da1e6f78
Document system activity intents that may not be implemented
...
All of these activity-start intents might be unimplemented on some
Android products. Document this to make sure that developers are
aware of the need to safeguard against this.
Bug: 68300743
Bug: 62201251
Bug: 69587018
Fixes: 77282739
Test: atest CtsContentTestCases:.AvailableIntentsTest
Change-Id: Ia2346d03ccb7f2bdad2b84ba9efff72413fdc3c2
2018-05-10 17:55:26 -07:00
Patrick Baumann
adc9fb5651
Merge "Expands javadocs for Intent.FLAG_ACTIVITY_MATCH_EXTERNAL" into pi-dev am: a1e56fb23b
...
am: 896935a5f8
2018-05-10 15:10:49 -07:00
Patrick Baumann
896935a5f8
Merge "Expands javadocs for Intent.FLAG_ACTIVITY_MATCH_EXTERNAL" into pi-dev
...
am: a1e56fb23b
2018-05-10 11:36:09 -07:00
TreeHugger Robot
a1e56fb23b
Merge "Expands javadocs for Intent.FLAG_ACTIVITY_MATCH_EXTERNAL" into pi-dev
2018-05-10 18:23:07 +00:00
Patrick Baumann
92ae2c6665
Expands javadocs for Intent.FLAG_ACTIVITY_MATCH_EXTERNAL
...
This change adds much needed detail to the new MATCH_EXTERNAL flag,
explaining some of the behavior changes that come with using it.
Test: none
Bug: 63117034
Bug: 79325769
Change-Id: Iab320d2171ffe8d8012a2928656ea61d5e0f0862
2018-05-10 10:13:53 -07:00
Bo Zhu
ad3c9066ef
Merge "Revert "Change the root of trust for CryptAuth Vault Service"" into pi-dev am: 3b0f011709
...
am: 4fabef2d66
2018-05-10 09:21:18 -07:00
Bo Zhu
4fabef2d66
Merge "Revert "Change the root of trust for CryptAuth Vault Service"" into pi-dev
...
am: 3b0f011709
2018-05-10 09:11:16 -07:00
Bo Zhu
3b0f011709
Merge "Revert "Change the root of trust for CryptAuth Vault Service"" into pi-dev
2018-05-10 15:56:48 +00:00
Bo Zhu
be4f735cb1
Revert "Change the root of trust for CryptAuth Vault Service"
...
This reverts commit 1f40978609
2018-05-10 15:53:08 +00:00
Kenny Guy
421338f853
Merge "Fix colorized messaging layout and smart replies." into pi-dev am: a1aafd7718
...
am: dd2ea24a43
2018-05-10 04:57:52 -07:00
Kenny Guy
dd2ea24a43
Merge "Fix colorized messaging layout and smart replies." into pi-dev
...
am: a1aafd7718
2018-05-10 04:48:29 -07:00
Kenny Guy
14d035c969
Fix colorized messaging layout and smart replies.
...
Modify messaging style and smart replies view to
cope with colorized backgrounds.
Bug: 78928664
Bug: 77927019
Test: atest SystemUITests (with patch from ag/3992401)
Test: visual - see bug for screenshots
Change-Id: Iee66931574fb48d0340986bf520532f798ef59fc
2018-05-10 10:25:14 +01:00
Régis Décamps
0bece9db0d
Merge "Reuse String literals rather new instance in UriMatcher"
2018-05-10 09:07:02 +00:00
Régis Décamps
e6dc996bf1
Reuse String literals rather new instance in UriMatcher
...
Micro-optimization: Instead of using a new instance of "#" and "*", reuse the
String literals. This will save 18 bytes for each "*" and "#" used in Uri
matchers.
Also, use switch/case rather than if/else for string matching.
Finally, add test and move TestClass in same package.
Bug: 32502682
Change-Id: Id672138a2213f68e05cafb4e88ed3c1e61c735a4
Test: Unit test
source build/envsetup.sh
lunch aosp_x86-eng
m -j 8
emulator -system out/target/product/generic_x86/system-qemu.img
make FrameworkCoreTests
adb -e install out/target/product/generic_x86/testcases/FrameworksCoreTests/FrameworksCoreTests.apk
adb -e shell am instrument -w -r -e class android.content.UriMatcherTest com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
2018-05-10 09:39:56 +02:00
Dianne Hackborn
19e99b432b
Merge "Further flesh out app ops foreground state." into pi-dev am: 7105e2ca9a
...
am: 74dc457242
2018-05-09 23:11:48 -07:00
Dianne Hackborn
74dc457242
Merge "Further flesh out app ops foreground state." into pi-dev
...
am: 7105e2ca9a
2018-05-09 22:59:34 -07:00
Remi NGUYEN VAN
205fbfd220
Merge "Fix android.net.SSLTest" am: ef43ea3238 am: 60b828ca86
...
am: f0e3b091f8
2018-05-09 19:41:07 -07:00
Remi NGUYEN VAN
f0e3b091f8
Merge "Fix android.net.SSLTest" am: ef43ea3238
...
am: 60b828ca86
2018-05-09 19:31:38 -07:00
Remi NGUYEN VAN
60b828ca86
Merge "Fix android.net.SSLTest"
...
am: ef43ea3238
2018-05-09 18:35:47 -07:00
Dianne Hackborn
65a4f251c7
Further flesh out app ops foreground state.
...
Fix some bugs, add the ability to monitor state changes, improve
dumpsys output to help debugging, add a new check API that allows
the caller to get the real state.
Bug: 78480444
Test: atest FrameworksServicesTests:AppOpsServiceTest
Test: atest CtsPermissionTestCases:AppOpsTest
Change-Id: I3d41be9968c1d95a1456f4052da958ea64aa068d
2018-05-09 18:02:35 -07:00
Remi NGUYEN VAN
ef43ea3238
Merge "Fix android.net.SSLTest"
2018-05-10 00:11:21 +00:00
fionaxu
f88ba11def
Merge "add install action for carrier id to system API" into pi-dev am: 689866352b
...
am: 907f3cd76b
2018-05-09 16:22:54 -07:00
fionaxu
907f3cd76b
Merge "add install action for carrier id to system API" into pi-dev
...
am: 689866352b
2018-05-09 16:08:26 -07:00
TreeHugger Robot
689866352b
Merge "add install action for carrier id to system API" into pi-dev
2018-05-09 22:47:40 +00:00
Patrick Baumann
64dce8e265
Merge "Allows disk reads when adding native paths to classloader" into pi-dev am: 147ef6b1a4
...
am: e4f5215f44
2018-05-09 14:43:29 -07:00
Patrick Baumann
e4f5215f44
Merge "Allows disk reads when adding native paths to classloader" into pi-dev
...
am: 147ef6b1a4
2018-05-09 14:34:44 -07:00
Philip P. Moltmann
ae57b77a40
Merge "DO NOT MERGE: Allow to control behavior of loadSafeLabel" into pi-dev
...
am: c8b3e0b617
2018-05-09 14:28:27 -07:00
TreeHugger Robot
147ef6b1a4
Merge "Allows disk reads when adding native paths to classloader" into pi-dev
2018-05-09 21:19:53 +00:00
TreeHugger Robot
c8b3e0b617
Merge "DO NOT MERGE: Allow to control behavior of loadSafeLabel" into pi-dev
2018-05-09 21:17:51 +00:00
