OSDN Git Service
TreeHugger Robot [Fri, 28 Apr 2017 00:41:21 +0000 (00:41 +0000)]
Merge "Expose missing accessibility settings to instant apps" into oc-dev
Mathias Agopian [Fri, 28 Apr 2017 00:29:28 +0000 (00:29 +0000)]
Merge "Plumb gralloc producer/consumer bits correctly" into oc-dev
Selim Cinek [Fri, 28 Apr 2017 00:24:49 +0000 (00:24 +0000)]
Merge changes from topic 'music_extraction' into oc-dev
* changes:
Make music notifications not dimmable
Implementing gradual image fade for the media template
Extracting the notification colors based on the album art
Moved notification builder creation to the background
Mathias Agopian [Thu, 20 Apr 2017 23:36:15 +0000 (16:36 -0700)]
Plumb gralloc producer/consumer bits correctly
Bug:
33350696
Test: compile, boot device, its
Change-Id: I6129cedce0b35acfef1702afdd178ba043dd53cb
TreeHugger Robot [Fri, 28 Apr 2017 00:04:07 +0000 (00:04 +0000)]
Merge "Bluetooth: Add constants to ScanResult" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 23:57:38 +0000 (23:57 +0000)]
Merge "Remove reference to removed string" into oc-dev
Android Build Merger (Role) [Thu, 27 Apr 2017 23:52:53 +0000 (23:52 +0000)]
Merge "Add logging around dream start/stop am:
4769b54d49 am:
b50a0cdd5e" into oc-dev
Erik Wolsheimer [Thu, 27 Apr 2017 23:51:45 +0000 (23:51 +0000)]
Add logging around dream start/stop am:
4769b54d49
am:
b50a0cdd5e
Change-Id: I0db4f7ff4c7782e71ff7a4e7528776462132d3ed
TreeHugger Robot [Thu, 27 Apr 2017 23:51:28 +0000 (23:51 +0000)]
Merge "add 'changes' cmd to dumpsys" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 23:45:38 +0000 (23:45 +0000)]
Merge "AAPT2: Add workaround for non-standard package IDs" into oc-dev
Erik Wolsheimer [Thu, 27 Apr 2017 23:43:19 +0000 (23:43 +0000)]
Add logging around dream start/stop
am:
4769b54d49
Change-Id: If77de68a0c775b32b6df7e95462f698efc2f84ee
TreeHugger Robot [Thu, 27 Apr 2017 23:38:22 +0000 (23:38 +0000)]
Merge "Throttle wifi scan requests from background apps (1/2)." into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 23:17:06 +0000 (23:17 +0000)]
Merge "Remove FontsContract.buildTypeface with weight/italic argument." into oc-dev
Joe Onorato [Thu, 27 Apr 2017 23:15:09 +0000 (23:15 +0000)]
Merge "Turn off log spew, and make it use Slog.w instead of e.printStackTrace" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 23:02:31 +0000 (23:02 +0000)]
Merge "Fixing service notification on secondary users" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 22:56:03 +0000 (22:56 +0000)]
Merge "Change snoozing behavior for notifications in groups" into oc-dev
Chad Brubaker [Thu, 27 Apr 2017 22:28:57 +0000 (15:28 -0700)]
Expose missing accessibility settings to instant apps
Fixes:
37631050
Test: EphemeralTest#testWebViewLoads
Change-Id: I9c4c6d5dd4b8f2c1e27009d77f6f11035d4f1667
Selim Cinek [Tue, 25 Apr 2017 05:18:48 +0000 (22:18 -0700)]
Make music notifications not dimmable
For contrast requirements and for the image effect
to work properly, music notifications should not be
dimmable.
Test: add music notification, look at lockscreen
Fixes:
36561228
Merged-In: I58313e1828c64d34737390ad03e1deef078a7059
Change-Id: I58313e1828c64d34737390ad03e1deef078a7059
Jakub Pawlowski [Thu, 27 Apr 2017 15:37:04 +0000 (08:37 -0700)]
Bluetooth: Add constants to ScanResult
Add TX_POWER_NOT_PRESENT and PERIODIC_INTERVAL_NOT_PRESENT
Test: none
Bug:
37536707
Change-Id: Ia48a30f44a961c6e0babd17ecaed0eb93c98ecad
(cherry-picked from commit
c7c01a28774e431a408744b443a674f2622fde9f)
Selim Cinek [Tue, 25 Apr 2017 02:48:29 +0000 (19:48 -0700)]
Implementing gradual image fade for the media template
Test: play music
Merged-In: I525513ce1da1237c4edad32c0ed31e79d5eacd32
Change-Id: I525513ce1da1237c4edad32c0ed31e79d5eacd32
Fixes:
36561228
Selim Cinek [Thu, 20 Apr 2017 23:55:38 +0000 (16:55 -0700)]
Extracting the notification colors based on the album art
Media notifications are now extracting the background and
foreground colors from the album art.
Test: manual, play different songs
Bug:
36561228
Merged-In: I9c3c962fa59eb70ef9b2d4893b939be6e1ee1ab0
Change-Id: I9c3c962fa59eb70ef9b2d4893b939be6e1ee1ab0
Jakub Pawlowski [Thu, 27 Apr 2017 22:20:37 +0000 (22:20 +0000)]
Merge changes from topic 'bt5-cherry-pickerry-3' into oc-dev
* changes:
Fix NPE when accessing mCallback in BluetoothGatt
Expose LE advertiser address for easier PTS tests (1/6)
Read by UUID for PTS tests (1/5)
TreeHugger Robot [Thu, 27 Apr 2017 22:18:00 +0000 (22:18 +0000)]
Merge "Address API feedback for new fragment APIs" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 22:10:44 +0000 (22:10 +0000)]
Merge "Disable Vulkan backend when running hwui_unit_tests." into oc-dev
Sujith Ramakrishnan [Thu, 27 Apr 2017 22:10:05 +0000 (22:10 +0000)]
Merge "Updated intent action name to comply with CTS." into oc-dev
Chris Tate [Thu, 27 Apr 2017 22:03:53 +0000 (22:03 +0000)]
Merge "Fix 'jobscheduler run' shell command" into oc-dev
Todd Kennedy [Thu, 27 Apr 2017 21:58:42 +0000 (14:58 -0700)]
add 'changes' cmd to dumpsys
Bug:
37714054
Test: Manual; adb shell dumpsys package changes
Change-Id: Ibab209f80da7ac588bae54c3226305a95306cd7c
TreeHugger Robot [Thu, 27 Apr 2017 21:44:50 +0000 (21:44 +0000)]
Merge "DO NOT MERGE Revert "Wallpaper color extraction API stub"" into oc-dev
Phil Weaver [Thu, 27 Apr 2017 21:42:47 +0000 (14:42 -0700)]
Remove reference to removed string
Bug:
37750336
Test: make
Change-Id: I982f9e9a4d40abaf3f990d85d7c02c79f3147a38
TreeHugger Robot [Thu, 27 Apr 2017 21:35:42 +0000 (21:35 +0000)]
Merge "new reset carrier signals/actions" into oc-dev
Selim Cinek [Thu, 20 Apr 2017 22:16:10 +0000 (15:16 -0700)]
Moved notification builder creation to the background
In preparation of future colorization work, the creation
of the notification builder is moved to the background.
Test: manual, add notifications, update them etc.
Test: runtest systemui
Bug:
36561228
Merged-In: Iaec5febf4d8d9da348d77e0d4f6f61b9746fae16
Change-Id: Iaec5febf4d8d9da348d77e0d4f6f61b9746fae16
Erik Wolsheimer [Thu, 27 Apr 2017 21:32:46 +0000 (14:32 -0700)]
Add logging around dream start/stop
Bug:
28455483
Change-Id: I31d4d52c3ed4cbfc6f6a9d978fd2669224ba95b4
Evan Rosky [Thu, 27 Apr 2017 21:28:08 +0000 (21:28 +0000)]
Merge "Only restrict arrows out of text fields from keyboard" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 21:23:35 +0000 (21:23 +0000)]
Merge "Use invalid package names for special keys in AccountManager." into oc-dev
Seigo Nonaka [Thu, 27 Apr 2017 21:15:52 +0000 (14:15 -0700)]
Remove FontsContract.buildTypeface with weight/italic argument.
Passing weight/italic to the family does not make sense.
Bug:
37750436
Test: N/A
Change-Id: I43a624179338c1f98aad36cfd08daa152e83944c
Suprabh Shukla [Wed, 26 Apr 2017 18:47:43 +0000 (11:47 -0700)]
Fixing service notification on secondary users
The notification was starting application details activity in user 0
instead of the user in which the service is running
Test: Manually tested that clicking on the notification starts app info
activity in the current user
Bug:
37530249
Change-Id: I9545c37bf1a36515813cbf1124c82c1c0fc3ad21
Merged-In: I9545c37bf1a36515813cbf1124c82c1c0fc3ad21
Jorim Jaggi [Thu, 27 Apr 2017 20:57:03 +0000 (20:57 +0000)]
Merge "Implement API council feedback for dismissKeyguard" into oc-dev
Julia Reynolds [Wed, 26 Apr 2017 14:19:25 +0000 (10:19 -0400)]
Change snoozing behavior for notifications in groups
- Snoozing a summary notification will snooze its current
children in addition to itself
- Posting a non-snoozed notification to a summary will
unsnooze the summary
- snoozing the only child of a group will also snooze the group
summary
Test: runtest systemui-notification
Change-Id: I5edba1461a59131c6c202f02e6f89404d22bb404
Fixes:
35934956
Sudheer Shanka [Thu, 27 Apr 2017 20:47:04 +0000 (20:47 +0000)]
Merge "Rename ActivityMonitor.onMatchIntent to onStartActivity." into oc-dev
Bryce Lee [Thu, 27 Apr 2017 20:41:32 +0000 (20:41 +0000)]
Merge "Don't call adjustFocusedActivityStackLocked on finished activity." into oc-dev
Sudheer Shanka [Thu, 27 Apr 2017 20:31:04 +0000 (20:31 +0000)]
Merge "Update VIMS internal state when a packge is modified." into oc-dev
Sujith Ramakrishnan [Mon, 24 Apr 2017 22:57:58 +0000 (15:57 -0700)]
Updated intent action name to comply with CTS.
- Updated "android.intent.action.GLOBAL_BUTTON" to
@SystemApi
Test: manual - Bottom button on Fugu brings up pairing screen
Test: manual - GUIDE button on Fugu brings up TV channels app
Bug:
37499047
Change-Id: I3b92ed99aeb53674fbaac91126e8c5e7fcffa715
Tima Vaisburd [Thu, 27 Apr 2017 20:22:09 +0000 (20:22 +0000)]
Merge "Hide getTextClassifier and setTextClassifier for WebView" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 20:21:44 +0000 (20:21 +0000)]
Merge "Improve docs for AssistStructure#isHomeActivity" into oc-dev
Jakub Pawlowski [Thu, 27 Apr 2017 14:04:15 +0000 (07:04 -0700)]
Fix NPE when accessing mCallback in BluetoothGatt
This issue was introduced in commit
4eab49652e48159fd37f827d30b822f2f187551e.
Bug:
37710354
Test: none
Change-Id: I2d985ce97c44d4e096713e156e57437f44ea3ddb
(cherry picked from commit
0e4ac75f2e291305a493796186d44a081926f3a8)
Jakub Pawlowski [Wed, 19 Apr 2017 13:52:08 +0000 (06:52 -0700)]
Expose LE advertiser address for easier PTS tests (1/6)
This patchset adds a hidden method getOwnAddress, that lets app with
BLUETOOTH_PRIVILEGED permission to lear their own addreess. This is done
exclusively for PTS tests.
Bug:
35147497
Test: manual
Change-Id: Iaf0f2fe0613de44b8430ac25e691d66a4ad44f8d
(cherry picked from commit
4bc4a441007e0a9ef6ccd1816c831ffd2dfa4c18)
Jakub Pawlowski [Fri, 14 Apr 2017 14:21:20 +0000 (07:21 -0700)]
Read by UUID for PTS tests (1/5)
Add a hidden api for reading characteristic by UUID for PTS.
Bug:
35150313
Test: sl4a GattReadTest.byUuid
Change-Id: Ice4076d99e4694d20374ba0fdcae74d5ae841147
(cherry picked from commit
de74891d1c603326691678ec301c80b4525bc4ef)
TreeHugger Robot [Thu, 27 Apr 2017 20:10:49 +0000 (20:10 +0000)]
Merge "SysUI A11y: Fix keyguard time utterance" into oc-dev
Makoto Onuki [Thu, 27 Apr 2017 20:03:16 +0000 (20:03 +0000)]
Merge "Change IMPORTANCE_PERCEPTIBLE_DEPRECATED to IMPORTANCE_PERCEPTIBLE_PRE_26" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 19:53:48 +0000 (19:53 +0000)]
Merge "Use InetAddress instead of String in network events." into oc-dev
Adam Powell [Tue, 25 Apr 2017 22:24:49 +0000 (15:24 -0700)]
Address API feedback for new fragment APIs
Framework edition
Bug:
37637473
Bug:
37636731
Bug:
37638276
Test: run fragment tests
Change-Id: I3e77ab51d60f5a550d60701fc81a84e143a53244
Chad Brubaker [Thu, 27 Apr 2017 19:30:50 +0000 (19:30 +0000)]
Merge "Allow apps to provide the Instant App installer extra information" into oc-dev
Dmitry Dementyev [Wed, 26 Apr 2017 00:02:47 +0000 (17:02 -0700)]
Use invalid package names for special keys in AccountManager.
Bug:
37672088
Test: cts, manual.
Change-Id: I7fd40e0646a50f809b5c9b89dfe4242ceb00195d
Christopher Tate [Thu, 27 Apr 2017 18:22:15 +0000 (11:22 -0700)]
Fix 'jobscheduler run' shell command
Tidying up the locking + deferred-work shape of the job scheduler's
internal flow inadvertently meant that we were now trying to bind to
a job service while under the shell user's uid when the relevant
shell command was used to kick off the job. Now we don't do that.
Bug
37744607
Test: manual
Change-Id: Ia4b83f83f9fbd2e5678eaa279f1d86206fb05023
TreeHugger Robot [Thu, 27 Apr 2017 19:03:18 +0000 (19:03 +0000)]
Merge "Reenable presubmit runs for BackupSettingsTest now that it's fixed" into oc-dev
Andrii Kulian [Thu, 27 Apr 2017 18:18:29 +0000 (18:18 +0000)]
Merge "Report correct display id in stack info" into oc-dev
Andrii Kulian [Thu, 27 Apr 2017 18:09:13 +0000 (18:09 +0000)]
Merge "Hide onMovedToDisplay callback" into oc-dev
fionaxu [Wed, 26 Apr 2017 23:05:25 +0000 (16:05 -0700)]
new reset carrier signals/actions
- new carrier signal intended for notifying carrier apps that all
carrier actions has been reset due to sim load/absent.
- default carrier apps clean up UI on reset actions.
Bug:
34626476
Test: Manual test on TMO and ZIP SIM
Change-Id: I232dd19294e99fb0a7d53ca1b5c049e6e3e2e050
Pavel Grafov [Thu, 27 Apr 2017 13:22:26 +0000 (14:22 +0100)]
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
Joe Onorato [Thu, 27 Apr 2017 01:37:57 +0000 (18:37 -0700)]
Turn off log spew, and make it use Slog.w instead of e.printStackTrace
That said, it's happening.
system 04-26 17:01:43.344 1000 1140 2684 W/ActivityManager: Failed setting process group of 21751 to 0
main 04-26 17:01:43.344 1000 1140 2684 W/System.err: java.lang.IllegalArgumentException: Given thread 21496 does not exist
main 04-26 17:01:43.349 1000 1140 2684 W/System.err: at android.os.Process.setThreadPriority(Native Method)
main 04-26 17:01:43.349 1000 1140 2684 W/System.err: at com.android.server.am.ActivityManagerService.applyOomAdjLocked(ActivityManagerService.java:21704)
main 04-26 17:01:43.349 1000 1140 2684 W/System.err: at com.android.server.am.ActivityManagerService.updateOomAdjLocked(ActivityManagerService.java:22015)
main 04-26 17:01:43.349 1000 1140 2684 W/System.err: at com.android.server.am.ActivityManagerService.updateOomAdjLocked(ActivityManagerService.java:22093)
main 04-26 17:01:43.349 1000 1140 2684 W/System.err: at com.android.server.am.ActiveServices.unbindServiceLocked(ActiveServices.java:1239)
main 04-26 17:01:43.349 1000 1140 2684 W/System.err: at com.android.server.am.ActivityManagerService.unbindService(ActivityManagerService.java:18127)
main 04-26 17:01:43.349 1000 1140 2684 W/System.err: at android.app.IActivityManager$Stub.onTransact(IActivityManager.java:594)
main 04-26 17:01:43.349 1000 1140 2684 W/System.err: at com.android.server.am.ActivityManagerService.onTransact(ActivityManagerService.java:2936)
main 04-26 17:01:43.350 1000 1140 2684 W/System.err: at android.os.Binder.execTransact(Binder.java:674)
Bug:
37252687
Test: development/tools/logblame/app_switch_log_test
Change-Id: I138147c34141e212256012afe8aaf239f3443b82
TreeHugger Robot [Thu, 27 Apr 2017 17:34:43 +0000 (17:34 +0000)]
Merge "Revise method comment on setFontVariationSettings" into oc-dev
David Farrow [Thu, 27 Apr 2017 17:28:28 +0000 (17:28 +0000)]
Merge "documentation fixes" into nyc-mr1-dev am:
14826e5489 am:
b1e3d9ab26
am:
4ea763ad8a
Change-Id: I1b3005ef17b9d54e1f9b9c75138d214e80fc414c
Rubin Xu [Thu, 27 Apr 2017 17:24:56 +0000 (17:24 +0000)]
Merge "Reduce scrypt time in synthetic password flow" into oc-dev
Doris Liu [Thu, 27 Apr 2017 17:20:19 +0000 (17:20 +0000)]
Merge "Refine JavaDocs for AnimatorSet#getCurrentPlayTime()" into oc-dev
David Farrow [Thu, 27 Apr 2017 17:19:21 +0000 (17:19 +0000)]
Merge "documentation fixes" into nyc-mr1-dev am:
14826e5489
am:
b1e3d9ab26
Change-Id: I4f2682c11384a9f656054b95cfba56132085634a
David Farrow [Thu, 27 Apr 2017 17:09:26 +0000 (17:09 +0000)]
Merge "documentation fixes" into nyc-mr1-dev
am:
14826e5489
Change-Id: I18df5f88d8f72ec74e62b39a056459e4e715b9db
Mady Mellor [Thu, 27 Apr 2017 17:01:24 +0000 (17:01 +0000)]
Merge "Improve swipe to show notification menu gesture" into oc-dev
David Farrow [Thu, 27 Apr 2017 17:01:09 +0000 (17:01 +0000)]
Merge "documentation fixes" into nyc-mr1-dev
TreeHugger Robot [Thu, 27 Apr 2017 16:42:59 +0000 (16:42 +0000)]
Merge "Use ActivityRecord.realActivity when comparing waiting visible" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 16:23:00 +0000 (16:23 +0000)]
Merge "Support profile global restrictions in disclosure messages." into oc-dev
Jorim Jaggi [Thu, 27 Apr 2017 12:30:39 +0000 (14:30 +0200)]
Implement API council feedback for dismissKeyguard
Test: KeyguardLockedTests CTS
Change-Id: Ibc6923ebe8363644e9b52b2b53b45d918124f52d
Fixes:
37673408
Derek Sollenberger [Thu, 27 Apr 2017 15:30:20 +0000 (11:30 -0400)]
Disable Vulkan backend when running hwui_unit_tests.
The Vulkan backend fails to run on devices without vulkan drivers.
Until we can stub out the vulkan drivers for those devices we find
an acceptable solution.
Test: hwui_unit_tests on device w/out vulkan
Bug:
37422708
Change-Id: I3d7c21882053459f25ca1eb5648cdf5dfd4c333e
Julia Reynolds [Thu, 27 Apr 2017 15:11:32 +0000 (15:11 +0000)]
Merge "New constant for new settings screen." into oc-dev
Stefan Ramsauer [Thu, 27 Apr 2017 15:09:21 +0000 (15:09 +0000)]
Merge "Fix parameter name mismatch in getResourceIdentifier." into oc-dev
Julia Reynolds [Sun, 23 Apr 2017 16:27:07 +0000 (12:27 -0400)]
New constant for new settings screen.
Bug:
36561295
Test: make
Change-Id: I0e2ec6d7b372a9594f8b583540804dde1b79de1a
Jason Monk [Thu, 27 Apr 2017 14:43:46 +0000 (14:43 +0000)]
Merge "Revert "Status bar updates" DO NOT MERGE" into oc-dev
Jason Monk [Wed, 26 Apr 2017 18:35:24 +0000 (14:35 -0400)]
Revert "Status bar updates" DO NOT MERGE
Test: runtest systemui
Fixes:
37626598
This reverts commit
d1ba5fbb54a02fad0c68f71183078527bfa9bd49.
Change-Id: I12c70b67fafd46ec98b1c1ee28b911e19afbf6e5
George Mount [Thu, 27 Apr 2017 14:06:10 +0000 (14:06 +0000)]
Merge "Address API council feedback." into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 13:50:52 +0000 (13:50 +0000)]
Merge "SmartSelection: Use downloaded model file." into oc-dev
Jason Monk [Thu, 27 Apr 2017 13:46:48 +0000 (13:46 +0000)]
Merge "Guard against incorrect context use." into oc-dev
Narayan Kamath [Thu, 27 Apr 2017 13:30:30 +0000 (13:30 +0000)]
Merge "Track libcore change
03e8c7dca78a95ccf719a7." into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 13:26:21 +0000 (13:26 +0000)]
Merge "Create a metrics events for ag/
2085657 (DO disclosure screens)" into oc-dev
Denis Kuznetsov [Thu, 13 Apr 2017 09:41:33 +0000 (11:41 +0200)]
Create a metrics events for ag/
2085657 (DO disclosure screens)
Bug:
32692748
Test: Tests for functional changes are in ag/
2085657
Change-Id: I6988a950ab2aa78dcb3f848b59a5b0905da7b204
Merged-In: I6988a950ab2aa78dcb3f848b59a5b0905da7b204
(cherry picked from commit
7152a41d25f0296ec5ed41c497f7666e185890eb)
Michal Karpinski [Thu, 27 Apr 2017 10:52:40 +0000 (11:52 +0100)]
Reenable presubmit runs for BackupSettingsTest now that it's fixed
Bug:
37684646
Test: mmma -j40 frameworks/base/core/tests/coretests, then
adb install -r ${ANDROID_PRODUCT_OUT}/data/app/FrameworksCoreTests/FrameworksCoreTests.apk, then
adb shell am instrument -w -e class android.provider.SettingsBackupTest com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I1927c08e445b914b84b55d40aba68c234d6abcb5
Pavel Grafov [Fri, 21 Apr 2017 19:03:26 +0000 (20:03 +0100)]
Support profile global restrictions in disclosure messages.
Starting from Android O ENSURE_VERIFY_APPS can be enforced globally
by profile owners. To take this into account, this CL uses newer
UserManager API for getting a list of enforcing admins with their
userIds instead of just a mask.
Bug:
37158436
Test: manually
Change-Id: Id18b365668373b5aa28d59fcc4d662a2f5d133d8
Joachim Sauer [Thu, 27 Apr 2017 10:49:40 +0000 (10:49 +0000)]
Merge "Deprecate internal Calendar methods." into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 09:41:08 +0000 (09:41 +0000)]
Merge "setAffiliationIds and getAffiliationIds uses set instead of list" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 09:41:08 +0000 (09:41 +0000)]
Merge "bindDeviceAdminService requires service to be proected by BIND_DEVICE_ADMIN" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 07:26:09 +0000 (07:26 +0000)]
Merge "Adds a comment to EXTRA_CONTENT_ANNOTATIONS to prevent developers from using colons in their customized annotations." into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 06:26:00 +0000 (06:26 +0000)]
Merge "Address API Council feedback." into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 05:55:58 +0000 (05:55 +0000)]
Merge "Expose Companion API via shell command" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 05:24:46 +0000 (05:24 +0000)]
Merge "docs: Update EditText JavaDoc comments" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 05:21:17 +0000 (05:21 +0000)]
Merge "docs: Update Button JavaDoc comments" into oc-dev
Tima Vaisburd [Thu, 27 Apr 2017 04:59:12 +0000 (21:59 -0700)]
Hide getTextClassifier and setTextClassifier for WebView
Bug:
37724053
Test: Not needed, these methods have not been implemented.
Change-Id: I43c97cb13e80eeb13d53123a22230d5934b8a60d
TreeHugger Robot [Thu, 27 Apr 2017 04:56:39 +0000 (04:56 +0000)]
Merge "Autofill binding permission fixes." into oc-dev
Adam Lesinski [Thu, 27 Apr 2017 04:49:53 +0000 (21:49 -0700)]
AAPT2: Add workaround for non-standard package IDs
The dynamic ref table used to map build-time IDs to runtime IDs
is mainly used for shared resource libraries and has a few built-in
mappings (app 0x7f and framework 0x01).
Using a non-standard package ID like 0x80 causes a failure in package ID
lookup. The solution is to ship the dynamic_ref_table with an identity mapping
with any resource table that uses a non-standard package ID.
Adds some tests to ensure this works correctly.
Bug:
37498913
Test: make libandroidfw_tests
Test: make aapt2_tests
Change-Id: Ic3f67942384d34e7fdcbc94ded360e940e3ebc8a
TreeHugger Robot [Thu, 27 Apr 2017 04:51:37 +0000 (04:51 +0000)]
Merge "Api updates" into oc-dev
Peng Xu [Thu, 27 Apr 2017 04:49:11 +0000 (04:49 +0000)]
Merge "[Stability]: fix system_server crash issue caused by fd leak." into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 04:46:29 +0000 (04:46 +0000)]
Merge "Fix volume key events are dispatched when screen is off" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 04:29:09 +0000 (04:29 +0000)]
Merge "docs: Update ScrollView JavaDoc comments" into oc-dev