Todd Kennedy
047c869e48
Merge "Merge "Add concept of implicitly exposed components" into oc-dev am: 0a4b7f5a86" into oc-dev-plus-aosp
...
am: eeb311e47d
2017-04-26 01:16:00 +00:00
Peng Xu
fd79d84906
Merge "Return correct value at initDataInjection and avoid crash" into oc-dev am: 1c5b71ec1f
...
am: b66e6c26d1
2017-04-26 01:01:48 +00:00
Chris Craik
cf200f26eb
Merge "Fix ViewOverlay#onDescendantInvalidated" into oc-dev am: db8f2fc025
...
am: a08dd9fff3
2017-04-26 00:59:58 +00:00
Makoto Onuki
13f215c04d
Merge "DeviceAdminService must be protected with BIND_DEVICE_ADMIN." into oc-dev am: 781c8cb65e
...
am: 1ddaa67a59
2017-04-26 00:54:07 +00:00
Eino-Ville Talvala
af382e6d94
Merge "Camera: Update docs for new auto-generation features" into oc-dev am: f879357cae
...
am: 50c37ee12e
2017-04-26 00:46:33 +00:00
Jeff Sharkey
e00742f4c5
Merge "Fix some issues found by new doclava linter." into oc-dev am: a00c7c0a99
...
am: db73950734
2017-04-26 00:41:04 +00:00
Seigo Nonaka
802c41bd11
Merge "Font provider cleaning ups." into oc-dev am: 5313eee98a
...
am: a3d5786a3d
2017-04-26 00:39:15 +00:00
Eugene Susla
43371da3ad
Merge "Remove underscore from Companion service name" into oc-dev am: 885b5f4466
...
am: 56620feed0
2017-04-26 00:36:49 +00:00
Wale Ogunwale
2e80263ec4
Merge "Switch ActivityRecord last reported config. to MergeConfiguration" into oc-dev am: 3ce611f1b4
...
am: a17d99a389
2017-04-26 00:27:56 +00:00
Todd Kennedy
8c3941d018
Merge "Add concept of implicitly exposed components" into oc-dev
...
am: 0a4b7f5a86
2017-04-25 23:55:55 +00:00
TreeHugger Robot
0a4b7f5a86
Merge "Add concept of implicitly exposed components" into oc-dev
2017-04-25 23:50:21 +00:00
Peng Xu
b66e6c26d1
Merge "Return correct value at initDataInjection and avoid crash" into oc-dev
...
am: 1c5b71ec1f
2017-04-25 23:29:14 +00:00
Chris Craik
a08dd9fff3
Merge "Fix ViewOverlay#onDescendantInvalidated" into oc-dev
...
am: db8f2fc025
2017-04-25 23:26:58 +00:00
TreeHugger Robot
1c5b71ec1f
Merge "Return correct value at initDataInjection and avoid crash" into oc-dev
2017-04-25 23:18:24 +00:00
TreeHugger Robot
db8f2fc025
Merge "Fix ViewOverlay#onDescendantInvalidated" into oc-dev
2017-04-25 23:15:52 +00:00
Makoto Onuki
1ddaa67a59
Merge "DeviceAdminService must be protected with BIND_DEVICE_ADMIN." into oc-dev
...
am: 781c8cb65e
2017-04-25 22:48:57 +00:00
TreeHugger Robot
781c8cb65e
Merge "DeviceAdminService must be protected with BIND_DEVICE_ADMIN." into oc-dev
2017-04-25 22:42:10 +00:00
Eino-Ville Talvala
50c37ee12e
Merge "Camera: Update docs for new auto-generation features" into oc-dev
...
am: f879357cae
2017-04-25 22:31:56 +00:00
Jeff Sharkey
db73950734
Merge "Fix some issues found by new doclava linter." into oc-dev
...
am: a00c7c0a99
2017-04-25 22:25:09 +00:00
TreeHugger Robot
f879357cae
Merge "Camera: Update docs for new auto-generation features" into oc-dev
2017-04-25 22:11:47 +00:00
Jeff Sharkey
a00c7c0a99
Merge "Fix some issues found by new doclava linter." into oc-dev
2017-04-25 22:11:01 +00:00
Seigo Nonaka
a3d5786a3d
Merge "Font provider cleaning ups." into oc-dev
...
am: 5313eee98a
2017-04-25 21:48:20 +00:00
Seigo Nonaka
5313eee98a
Merge "Font provider cleaning ups." into oc-dev
2017-04-25 21:40:42 +00:00
Eugene Susla
56620feed0
Merge "Remove underscore from Companion service name" into oc-dev
...
am: 885b5f4466
2017-04-25 21:37:40 +00:00
Jakub Pawlowski
d5b8da0f97
Merge "Bluetooth: expand comments on new PHY constants" am: bdeb8539e8 am: 3e56fdba72 am: adc97e1c33
...
am: ba785bb0ba
2017-04-25 21:31:10 +00:00
Jakub Pawlowski
6c9192cbb9
Merge "Merge "Bluetooth: Add handler parameter to connectGatt" am: 1f4e111808 am: 41eae807ef am: 36ceeb548e" into oc-dev-plus-aosp
...
am: 45ed148f6d
2017-04-25 21:27:32 +00:00
TreeHugger Robot
885b5f4466
Merge "Remove underscore from Companion service name" into oc-dev
2017-04-25 21:26:15 +00:00
Wale Ogunwale
a17d99a389
Merge "Switch ActivityRecord last reported config. to MergeConfiguration" into oc-dev
...
am: 3ce611f1b4
2017-04-25 21:16:00 +00:00
Phil Weaver
fb805e0fe6
Merge "Merge "Remove a11y web flags and associated settings" into oc-dev am: cd68c334ba" into oc-dev-plus-aosp
...
am: b471a37b10
2017-04-25 21:13:19 +00:00
Jakub Pawlowski
6656ec74e2
Merge "Bluetooth: document status value in PHY read/update" am: 06abc2c404 am: 3d95c68d2e am: 6260ea5ab7
...
am: 343ef5d024
2017-04-25 21:04:48 +00:00
TreeHugger Robot
3ce611f1b4
Merge "Switch ActivityRecord last reported config. to MergeConfiguration" into oc-dev
2017-04-25 20:58:38 +00:00
TreeHugger Robot
d3104d7bbe
Merge "Address API Council feedback."
2017-04-25 20:53:43 +00:00
Julia Reynolds
a047d8944b
Merge "Allow some notifications in a group to be muted" into oc-dev am: 9685128edf
...
am: 5bc54aad76
2017-04-25 20:47:12 +00:00
Pavel Grafov
b8349c7f11
Merge "Fix javadoc to clearly express units and base for time value." into oc-dev am: 0a001ed37f
...
am: 31f94f28d2
2017-04-25 20:42:42 +00:00
Todd Kennedy
c05f5d12d9
Add concept of implicitly exposed components
...
Implicitly exposed components are those that can still be accessed
via generic startActivity() calls. However, they cannot be started
by specifying a package or component. Additionally, package info
can't be obtained if the package only has implicitly shared
components.
Change-Id: I404a4dff87559cfeee6ad78f7dcc7f5d849d6869
Fixes: b_37343345
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
2017-04-25 13:34:23 -07:00
Chris Craik
bc44b1a693
Fix ViewOverlay#onDescendantInvalidated
...
Fixes: 37307001
Test: android.view.ViewInvalidateTest
Also removes damageChildInParent, since it's not called anywhere.
Change-Id: Ic81d4465e4828c5826957ace2c44ac263b4662bd
2017-04-25 13:32:19 -07:00
Makoto Onuki
fe73970116
DeviceAdminService must be protected with BIND_DEVICE_ADMIN.
...
Bug: 37625902
Bug: 36226832
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l DEBUG -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceAdminServiceDeviceOwnerTest
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l DEBUG -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceAdminServiceProfileOwnerTest
Change-Id: I0bee75d758b565c6587d0e9cabf63bec351a0669
2017-04-25 13:31:37 -07:00
Amin Shaikh
f3024d69ec
Merge changes from topic 'experio-scoring' into oc-dev am: bad4573bd4
...
am: 592ecd0b5a
2017-04-25 20:14:37 +00:00
Felipe Leme
83e4d4bed6
Merge "Make new onFill/onSave methods abstract." into oc-dev am: 3411adc4b3
...
am: 2509121907
2017-04-25 20:12:17 +00:00
Jakub Pawlowski
ba785bb0ba
Merge "Bluetooth: expand comments on new PHY constants" am: bdeb8539e8 am: 3e56fdba72
...
am: adc97e1c33
2017-04-25 20:06:17 +00:00
Jakub Pawlowski
701370c140
Merge "Bluetooth: Add handler parameter to connectGatt" am: 1f4e111808 am: 41eae807ef
...
am: 36ceeb548e
2017-04-25 20:01:57 +00:00
Tony Wickham
d908d49526
Merge "Address API Review comments" into oc-dev am: 974cea8f4c
...
am: e90ece4635
2017-04-25 20:01:24 +00:00
Peng Xu
6d8e5f6854
Merge "sensors: fix concurrent modification exception" into oc-dev am: 9098a0260f
...
am: 90c60be02f
2017-04-25 19:57:18 +00:00
Jakub Pawlowski
adc97e1c33
Merge "Bluetooth: expand comments on new PHY constants" am: bdeb8539e8
...
am: 3e56fdba72
2017-04-25 19:56:43 +00:00
Jakub Pawlowski
36ceeb548e
Merge "Bluetooth: Add handler parameter to connectGatt" am: 1f4e111808
...
am: 41eae807ef
2017-04-25 19:54:54 +00:00
Android Build Merger (Role)
b471a37b10
Merge "Merge "Remove a11y web flags and associated settings" into oc-dev am: cd68c334ba" into oc-dev-plus-aosp
2017-04-25 19:53:33 +00:00
Phil Weaver
af3255b931
Merge "Remove a11y web flags and associated settings" into oc-dev
...
am: cd68c334ba
2017-04-25 19:52:07 +00:00
Jakub Pawlowski
343ef5d024
Merge "Bluetooth: document status value in PHY read/update" am: 06abc2c404 am: 3d95c68d2e
...
am: 6260ea5ab7
2017-04-25 19:51:38 +00:00
Jakub Pawlowski
6260ea5ab7
Merge "Bluetooth: document status value in PHY read/update" am: 06abc2c404
...
am: 3d95c68d2e
2017-04-25 19:41:54 +00:00
Seigo Nonaka
54084b64b1
Font provider cleaning ups.
...
- Remove Columns.STYLE
- Decouple Context from Typeface.
- Make FontsContract constructor private since it is essentially static.
- Removed unused constants.
Bug: 37281200
Bug: 37268410
Test: am instrument -w -e class android.provider.FontsContractE2ETest
com.android.frameworks.coretests/\
android.support.test.runner.AndroidJUnitRunner
Test: am instrument -w -e class android.provider.FontsContractTest
com.android.frameworks.coretests/\
android.support.test.runner.AndroidJUnitRunner
Test: am instrument -w -e class android.graphics.cts.TypefaceTest
android.graphics.cts/android.support.test.runner.AndroidJUnitRunner
Change-Id: Ic46c256141d27ca28f30023bcc40f4e1161d5338
2017-04-25 19:40:58 +00:00
