OSDN Git Service
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)
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
TreeHugger Robot [Thu, 27 Apr 2017 04:56:39 +0000 (04:56 +0000)]
Merge "Autofill binding permission fixes." into oc-dev
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
TreeHugger Robot [Thu, 27 Apr 2017 04:28:31 +0000 (04:28 +0000)]
Merge "docs: Update RelativeLayout.LayoutParams JavaDoc comments" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 04:22:20 +0000 (04:22 +0000)]
Merge "Handle package changes in autofill manager service" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 04:21:09 +0000 (04:21 +0000)]
Merge "docs: Update LinearLayout JavaDoc comments" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 04:12:44 +0000 (04:12 +0000)]
Merge "docs: Update ProgressBar JavaDoc comments" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 03:59:53 +0000 (03:59 +0000)]
Merge "Blame services for slow operations" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 03:51:29 +0000 (03:51 +0000)]
Merge "Add device ID attestation method to keymaster" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 03:50:47 +0000 (03:50 +0000)]
Merge "Call getAllowedUid on a separate thread" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 03:45:50 +0000 (03:45 +0000)]
Merge "Clarify some IpManager/ApfFilter debugging output." into oc-dev
Svetoslav Ganov [Thu, 27 Apr 2017 03:01:55 +0000 (03:01 +0000)]
Merge "Drop uses-feature requirement for system process" into oc-dev
songjinshi [Wed, 15 Mar 2017 08:16:05 +0000 (16:16 +0800)]
[Stability]: fix system_server crash issue caused by fd leak.
If an app incorrect use of registerListener, it will cause
system_server socket fd leak, for example:
protected void onResume() {
super.onResume();
mSensorManager.registerListener(new MySensorEventListener(),
mSensor, SensorManager.SENSOR_DELAY_UI);
Each time a new SensorEventQueue, then in the system_server
will open a new socket fd, as time increases system_server's
fd will be more than 1024 and crash, so we needed add count limit
for sensor listener to improve the system stability.
Test: use the apk attached in the issue
https://code.google.com/p/android/issues/detail?id=258634
Bug:
37543280
Change-Id: I35006966a1638c25bb0f54611e117e16a764e12b
Signed-off-by: songjinshi <songjinshi@xiaomi.com>
Svet Ganov [Thu, 27 Apr 2017 01:49:30 +0000 (18:49 -0700)]
Handle package changes in autofill manager service
Autofill manager service was not observing package changes thus
we did not properly handle the cases of the service being updated,
added, and removed. Handling, additions is needed to properly
support restore from a backup. Fixed a few missing locks.
Test: all autofill CTS tests pass and manually tested update, add,
and remove of autofill services.
bug:
36638606
bug:
36978445
Change-Id: Idd47891774ba2a4e562a1952cbb5a048211fd4e3
Daniel Sandler [Thu, 27 Apr 2017 01:23:52 +0000 (01:23 +0000)]
Merge "Avoid ClassCastException in ArrayMap." into oc-dev
Felipe Leme [Thu, 27 Apr 2017 00:42:38 +0000 (17:42 -0700)]
Autofill binding permission fixes.
- Removed deprecated BIND_AUTO_FILL
- Renamed BIND_AUTOFILL to BIND_AUTOFILL_SERVICE
- Kept BIND_AUTOFILL as @hide
- Fixed the permission code
The permission check was actually ignored; it was probably broken when we
introduced support to settings.
Fixes:
37723410
Bug:
37563972
Test: manual verification with existing client
Test: CtsAutoFillServiceTestCases pass
Change-Id: If3abdcb0ae850f0a327bfdbb9ca6c44a24823047
Andrii Kulian [Thu, 27 Apr 2017 00:46:05 +0000 (00:46 +0000)]
Merge "Check only task's override config for adjusting bounds" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 00:33:16 +0000 (00:33 +0000)]
Merge "Temporary tracking of JobStatus unprepare" into oc-dev
Winson Chung [Wed, 26 Apr 2017 21:02:13 +0000 (14:02 -0700)]
Fixing issue with lingering dismiss PiP overlay.
- Always try and remove the dismiss overlay when animating touch ends, or
if the input consumer is unregistered to handle cases where the
interaction is interrupted by the pip animation.
Bug:
37309693
Test: Intermittent, enter pip and try to tap and then tap-drag the PIP
Change-Id: I05f360f1d9d264590725e13eb2cc9254a3f21eef
Winson Chung [Wed, 26 Apr 2017 15:46:24 +0000 (08:46 -0700)]
Fix issue with dismiss scrim not spanning full screen
Bug:
37309741
Test: Launch PIP activity, go to landscape, drag and ensure dismiss
overlay spans fullscreen
Change-Id: I449c9f2bdaf01357ebdb652665e884c1ada5ea46
Winson Chung [Tue, 25 Apr 2017 21:43:10 +0000 (14:43 -0700)]
Prevent IME adjustment for stacks not affected by docked stack resizing
Bug:
37358175
Test: Resize docked stack while PIP is up
Change-Id: I4f057f6671e8c164624359bf3532f9a22fdf768e
Winson Chung [Tue, 25 Apr 2017 18:00:48 +0000 (11:00 -0700)]
Updating PiP API and documentation.
- Renaming PictureInPictureArgs to PictureInPictureParams, making it
immutable and built with a builder class. In addition, making the
aspect ratio rational.
- Moving the check to get max number of actions to the activity to have
more flexibility going forward
- Also ensures that enterPictureInPictureMode() returns true if the
activity is already in PiP mode.
- Will follow up with CL to remove PictureInPictureArgs and related methods
once this CL drops
Bug:
35765211
Bug:
37638323
Bug:
37637423
Bug:
37636674
Bug:
36342780
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: android.app.cts.PictureInPictureParamsBuilderTest
Change-Id: I54a487d55a59c9ce8ac7bd6c80c61209c8b26224
Signed-off-by: Winson Chung <winsonc@google.com>
Felipe Leme [Wed, 26 Apr 2017 23:46:16 +0000 (23:46 +0000)]
Merge "Provide support for optimized ACTION_REQUEST_SET_AUTOFILL_SERVICE." into oc-dev
Makoto Onuki [Wed, 26 Apr 2017 23:33:56 +0000 (23:33 +0000)]
Merge "Enhance DeviceAdminService javadoc and remove TODO." into oc-dev
TreeHugger Robot [Wed, 26 Apr 2017 23:26:43 +0000 (23:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Wed, 26 Apr 2017 23:25:49 +0000 (23:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Wed, 26 Apr 2017 23:24:27 +0000 (23:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Seigo Nonaka [Wed, 26 Apr 2017 23:19:51 +0000 (23:19 +0000)]
Merge "Font API clean up" into oc-dev
Makoto Onuki [Wed, 26 Apr 2017 23:18:43 +0000 (23:18 +0000)]
Merge "Only show progress log every 10%" into oc-dev
Christopher Tate [Wed, 26 Apr 2017 22:41:37 +0000 (15:41 -0700)]
Temporary tracking of JobStatus unprepare
For help diagnosing bug
37209909
Test: manual
Change-Id: If93ee0d25f462d5c8e954d3d7cbdc280b5d18c7e
Tony Mak [Tue, 25 Apr 2017 08:29:55 +0000 (09:29 +0100)]
setAffiliationIds and getAffiliationIds uses set instead of list
Didn't use @remove because java doesn't support two methods differs from
the return type only.
Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.DeviceOwnerTest#testLockTask_unaffiliatedUser
Test: runtest -x frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.DeviceOwnerPlusProfileOwnerTest
Change-Id: Ic7c7221ef5e680a6765f028c2ab73d4c2f908c58
Fix:
37622682
Conrad Chen [Wed, 26 Apr 2017 21:47:55 +0000 (21:47 +0000)]
Merge "TIF: fix javadoc of recorded programs" into oc-dev
Rob Carr [Wed, 26 Apr 2017 21:43:51 +0000 (21:43 +0000)]
Merge "More targeted version of "Correct animation glitch for pinned stack."" into oc-dev
Rob Carr [Wed, 26 Apr 2017 21:43:25 +0000 (21:43 +0000)]
Merge "Fix logspam NPE." into oc-dev
George Mount [Wed, 26 Apr 2017 20:10:59 +0000 (13:10 -0700)]
Address API council feedback.
Bug
37636027
Change FragmentTransaction#setAllowOptimization() to
FragmentTransaction#setReorderingAllowed().
Test: I729dc05bde1f6eba6ff8d38eb15f65de777c14bb
Change-Id: I24c35aad95ffa14d2e2fa092ae71d3d459e6d648
TreeHugger Robot [Wed, 26 Apr 2017 21:28:23 +0000 (21:28 +0000)]
Merge "Fix BackupSettingsTest (update blacklists)" into oc-dev
Android Build Merger (Role) [Wed, 26 Apr 2017 21:07:59 +0000 (21:07 +0000)]
Merge "DO NOT MERGE: change SET_DISPLAY_OFFSET namespace to com.android.permission.* This is to avoid API Level 25 CTS issues. am:
31add96517 am:
a701205315 -s ours" into oc-dev
Alison Cichowlas [Wed, 26 Apr 2017 21:07:49 +0000 (21:07 +0000)]
Merge "Use uptimeMillis instead of currentTimeMillis for interval calculation." into oc-dev
Julius D'souza [Wed, 26 Apr 2017 21:06:55 +0000 (21:06 +0000)]
DO NOT MERGE: change SET_DISPLAY_OFFSET namespace to com.android.permission.* This is to avoid API Level 25 CTS issues. am:
31add96517
am:
a701205315 -s ours
Change-Id: I001aea36b99da8cf3c209fb3c5c316200b0d08a2
Julius D'souza [Wed, 26 Apr 2017 20:54:04 +0000 (20:54 +0000)]
DO NOT MERGE: change SET_DISPLAY_OFFSET namespace to com.android.permission.* This is to avoid API Level 25 CTS issues. am:
31add96517
am:
a701205315 -s ours
Change-Id: I2c67e135cfa5d423acd322d1a797222c7018bb2f
TreeHugger Robot [Wed, 26 Apr 2017 20:51:57 +0000 (20:51 +0000)]
Merge "Add ability to fling to dismiss PIP from anywhere" into oc-dev
Julius D'souza [Wed, 26 Apr 2017 20:47:26 +0000 (20:47 +0000)]
DO NOT MERGE: change SET_DISPLAY_OFFSET namespace to com.android.permission.* This is to avoid API Level 25 CTS issues.
am:
31add96517
Change-Id: Id12dd73ed18fee0b874af364bad954d39384287f
Abodunrinwa Toki [Tue, 25 Apr 2017 00:39:19 +0000 (01:39 +0100)]
SmartSelection: Use downloaded model file.
This cl introduces support for reading the smart selection model
file downloaded via ConfigUpdater. It decides on whether to use this
file based on the language and version of the model file.
Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Bug:
34780396
Change-Id: Ie17b9908a0b4eac16a671b0bd633a89da7bc3fee
Eugene Susla [Mon, 24 Apr 2017 20:25:35 +0000 (13:25 -0700)]
Expose Companion API via shell command
Usage:
adb shell cmd companion_device ...
Test: Call each subcommand and ensure it works
Change-Id: I383995221384013b798fdd1c30a2846e14f7ad06
Hyungtae Kim [Wed, 26 Apr 2017 20:05:14 +0000 (20:05 +0000)]
Merge "MediaFrameworkTest: compare media type only for supported media check" into oc-dev
Hall Liu [Wed, 26 Apr 2017 20:04:26 +0000 (20:04 +0000)]
Merge "Remove default public ctor from RttModifyStatus" into oc-dev
TreeHugger Robot [Wed, 26 Apr 2017 19:44:16 +0000 (19:44 +0000)]
Merge "Gather shared libs for split apks based on dependencies." into oc-dev
Robert Carr [Tue, 25 Apr 2017 21:46:50 +0000 (14:46 -0700)]
More targeted version of "Correct animation glitch for pinned stack."
See the referenced CL "Correct animation glitch" for an explanation of
why an exception in this area is required. That CL based the exception
off the dummy animation state, however it seems we also enter this
state in various docked transitions but in that case the dummy animation
will have the incorrect transforms referenced by the original comment.
Now we target the fix on the bounds animating state instead.
Bug:
37448295
Bug:
36777039
Bug:
37511473
Test: Dock app from recents, no stretching. Auto-pip app, doesn't get stuck in top-left. Yay!
Change-Id: I5c9a7384622de9cedcc4be4dec7caacf58c683eb
Michal Karpinski [Wed, 26 Apr 2017 18:25:25 +0000 (19:25 +0100)]
Fix BackupSettingsTest (update blacklists)
Adjust blacklists to add new Settings that are not backed up.
I don't personally think any of them are candidates for being backed up.
Remove AUTOFILL_SERVICE from blacklist since it's now being backed up.
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: Iab8879b28289094f210c7612cc6ad1be3ca9a81c
Felipe Leme [Tue, 25 Apr 2017 22:54:06 +0000 (15:54 -0700)]
Provide support for optimized ACTION_REQUEST_SET_AUTOFILL_SERVICE.
Also removed obsolete 'cmd autofill save'
Bug:
2153814
Test: manual verification
Change-Id: I082e6bb098e9be5d9e26d0941efcf6f28ab01e1d
Makoto Onuki [Wed, 26 Apr 2017 18:42:14 +0000 (11:42 -0700)]
Enhance DeviceAdminService javadoc and remove TODO.
Test: Javadoc only
Bug:
37706621
Change-Id: Iac09675ca923adf40aef8f1871ddd0de797d4a08
Andrii Kulian [Wed, 26 Apr 2017 18:07:52 +0000 (11:07 -0700)]
Check only task's override config for adjusting bounds
We're only using task override when setting bounds, so no need
to update if merged override config is non-empty but task override
is empty.
Bug:
37648662
Test: Existing tests still pass
Change-Id: I73fd91983bf562dc888081b2a3d590b629aad255
Felipe Leme [Wed, 26 Apr 2017 18:38:12 +0000 (18:38 +0000)]
Merge "Provide a way to set AutofillId on ViewStructure." into oc-dev
Sundeep Ghuman [Wed, 26 Apr 2017 18:32:42 +0000 (18:32 +0000)]
Merge changes from topic 'wifitracker' into oc-dev
* changes:
Use synchronization rather than locking in WifiTracker.
Remove all pending callbacks in stopTracking.
Dan Sandler [Fri, 14 Apr 2017 00:21:12 +0000 (20:21 -0400)]
Avoid ClassCastException in ArrayMap.
Only happens if you're put()ing and clear()ing the map from
different threads, and Dianne told you not to do that.
In addition to avoiding the cache poisoning that results
from concurrent access, ArrayMap now attempts to throw
ConcurrentModificationException if clear() or
ensureCapacity() or put() notices you've modified the map
elsewhere.
Bug:
32994281
Test: runtest -x frameworks/base/core/tests/coretests/src/android/util/ArrayMapTest.java
runtest -x cts/tests/tests/util/src/android/util/cts/ArrayMapTest.java
Change-Id: Ia75970aa9e2b2b65692179f51243584b9773797f
Julius D'souza [Wed, 26 Apr 2017 18:14:00 +0000 (11:14 -0700)]
DO NOT MERGE: change SET_DISPLAY_OFFSET namespace to com.android.permission.*
This is to avoid API Level 25 CTS issues.
Bug:
37646165
Change-Id: I1fec4dc0b7497eb3dafb9c2f704bb02b8ecde1a9
Nathan Harold [Wed, 26 Apr 2017 18:02:49 +0000 (18:02 +0000)]
Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm" into oc-dev
Seigo Nonaka [Wed, 26 Apr 2017 16:53:38 +0000 (09:53 -0700)]
Font API clean up
- Move FontRequest from android.graphics.fonts to android.provider since
this is only used by android.provider.FontsContract and never draw
anything.
- FontRequest is no longer being Parcelable.
- Remove FontSpec.aidl which is not necessary.
Bug:
37326126
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.provider.cts.FontProviderTest
android.provider.cts/android.support.test.runner.AndroidJUnitRunner
Test: am instrument -w -e class android.provider.cts.FontRequestTest
android.provider.cts/android.support.test.runner.AndroidJUnitRunner
Change-Id: I0eb501844247c2f07eaa1fc7a71f72e404888b5b
Seigo Nonaka [Wed, 26 Apr 2017 17:49:53 +0000 (17:49 +0000)]
Merge "Load font file from remote provider synchronously." into oc-dev
Seigo Nonaka [Wed, 26 Apr 2017 17:48:35 +0000 (17:48 +0000)]
Merge "Update FontsContract.requestFonts" into oc-dev
Julia Reynolds [Wed, 26 Apr 2017 17:43:26 +0000 (17:43 +0000)]
Merge "Update app level fields when misc channel is updated" into oc-dev
Wonsik Kim [Fri, 21 Apr 2017 23:07:34 +0000 (16:07 -0700)]
MediaFrameworkTest: compare media type only for supported media check
This is a CL to fix media test that is needed to
ensure the local media playback works.
This doesn't affect any OC feature.
Bug:
36699113
Test: adb shell am instrument -w -r -e class com.android.mediaframeworktest.stress.MediaPlayerStressTest com.android.mediaframeworktest/.MediaPlayerStressTestRunner
Change-Id: If1200e7f9a8c734b07f3f2a0420b3942920c948b
(cherry picked from commit
09fc83c8f820e231056141ecaeb54cffb334663e)
Alison Cichowlas [Tue, 25 Apr 2017 22:04:40 +0000 (18:04 -0400)]
Use uptimeMillis instead of currentTimeMillis for interval calculation.
uptime is guaranteed monotonic; currentTime may go backwards in the event
of NTP updates or other wackiness.
Test: manual sanity check of logs; android.support.test.metricshelper.MetricsAssertsTest passes
Bug:
37538546,
18584861
Change-Id: I222b20be9d561e1184b11155fe44c574d90872a5
Svetoslav Ganov [Tue, 25 Apr 2017 01:11:27 +0000 (18:11 -0700)]
Get rid of custom negaitve save button label
Removed the ability for an autofill provider to set
a custom string for the negative button. Also make
the old hidden APIs non-abstract to avoid runime
crashes for unimplemented methods.
Test: CtsAutoFillServiceTestCases pass
bug:
37649790
Change-Id: If776d26de48382eeb064bdead5d4d5fdb0ff2e7e
Adrian Roos [Wed, 26 Apr 2017 16:43:50 +0000 (16:43 +0000)]
Merge "AOD: Fix layout" into oc-dev
Adrian Roos [Wed, 26 Apr 2017 16:43:30 +0000 (16:43 +0000)]
Merge "AOD: Remove wake up fully config flag" into oc-dev
Adrian Roos [Wed, 26 Apr 2017 16:43:19 +0000 (16:43 +0000)]
Merge "AOD: Limit visible icons on shelf" into oc-dev
Kang Li [Wed, 26 Apr 2017 16:19:54 +0000 (09:19 -0700)]
Adds a comment to EXTRA_CONTENT_ANNOTATIONS to prevent developers from
using colons in their customized annotations.
bug:
37496130
Test: skipped, because all changes are in comments.
Change-Id: Ifd7592c50f5079bb6035b051bf63f986c7cbae84
Dongwon Kang [Wed, 26 Apr 2017 16:22:08 +0000 (16:22 +0000)]
Merge "TIF: fix documentation in TvContract" into oc-dev
Bartosz Fabianowski [Mon, 24 Apr 2017 11:57:46 +0000 (13:57 +0200)]
Add device ID attestation method to keymaster
Device ID attestation consists of three steps:
* Generate a temporary key
* Attest the key and desired device IDs
* Delete the temporary key
Rather than being spread over three keymaster APIs, these operations
should happen automatically in a single keymaster method.
Bug:
34734938
Test: GTS com.google.android.gts.security.DeviceIdAttestationHostTest
Change-Id: Ifabb5163b9e4d12cb309a6b0ca8e5f2f92d212f4
Jean-Michel Trivi [Wed, 26 Apr 2017 15:26:59 +0000 (15:26 +0000)]
Merge "Audio focus enforcement: duck automatically apps for SDK O+" into oc-dev
Philip P. Moltmann [Wed, 26 Apr 2017 14:16:46 +0000 (14:16 +0000)]
Merge changes from topics 'AutofillContext2', 'AutofillContext' into oc-dev
* changes:
Return all previous FillContexts onFill
Report multiple FillContext-s onSave
Tony Mak [Tue, 25 Apr 2017 11:07:14 +0000 (12:07 +0100)]
bindDeviceAdminService requires service to be proected by BIND_DEVICE_ADMIN
Test: cts-tradefed cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.DeviceOwnerPlusProfileOwnerTest
Fix:
37624960
Change-Id: I0df88d2a019a0c5f8f997db1efede35a20441fa8
Wale Ogunwale [Wed, 26 Apr 2017 12:35:08 +0000 (12:35 +0000)]
Merge "Reduce use of static variables in window manager unit tests" into oc-dev
Michal Karpinski [Wed, 26 Apr 2017 09:44:49 +0000 (09:44 +0000)]
Merge "Offload the mRunningFullBackupTask.handleCancel() call from the main thread to another thread" into oc-dev
Narayan Kamath [Wed, 26 Apr 2017 09:24:09 +0000 (10:24 +0100)]
Track libcore change
03e8c7dca78a95ccf719a7.
Deprecate dalvik.system.DexFile.
Bug:
37693775
Test: make checkapi;
Change-Id: I37c9068e3d4b2b2599eee96f75185c13b328bda6
Bill Yi [Wed, 26 Apr 2017 08:55:05 +0000 (01:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iccb67d7bfc8c34b3e6d4e0c4736ec38c0166c1ae
Auto-generated-cl: translation import
Erik Kline [Fri, 21 Apr 2017 08:56:55 +0000 (17:56 +0900)]
Clarify some IpManager/ApfFilter debugging output.
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
- "adb shell dumpsys wifi ipmanager" shows updated output
Bug:
34793131
Change-Id: I6dec135b97343943efb421ef7b2e84c4751dd5ea
(cherry picked from commit
af579eb5b516296a8ec0b02d824f2ba646e60ca2)
Jakub Pawlowski [Wed, 26 Apr 2017 08:16:48 +0000 (08:16 +0000)]
Merge changes I8f5a756a,I2bac468f,I043dfefa,I2c55f96e into oc-dev
* changes:
Bluetooth: expand comments on new PHY constants
Bluetooth: document status value in PHY read/update
Bluetooth: Add handler parameter to connectGatt
Get rid of the IAdvertiserCallabck
Joe Fernandez [Wed, 26 Apr 2017 07:15:44 +0000 (00:15 -0700)]
docs: Update ScrollView JavaDoc comments
- reworded introduction for clarity
- crosslink to nestedscrollview
- simplify language around the “don’ts”
- crosslink to the material design guidelines for scrolling techniques
Test: docs only change. Tested with doc build
Change-Id: Ia6d1e5ce0f9abd3db2c1988537bd42013851596f
Bill Yi [Wed, 26 Apr 2017 07:16:24 +0000 (00:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: I33675c43783b79bf3492b795e2de8b64f07faf5b
Auto-generated-cl: translation import
Joe Fernandez [Wed, 26 Apr 2017 06:39:17 +0000 (23:39 -0700)]
docs: Update LinearLayout JavaDoc comments
Updated top-level description to:
- favor explanations of using XML for setting attributes (instead of using
methods like setGravity()
- add code example
- clarify what "child view" means
- add context around cross-link to layout params
- add context around cross-link Linear Layout guide (this guide focuses on
layout_weight)
Test: docs change only. Tested with doc build
Change-Id: Ifc1fa4cf24e2afa229f1c20b3f725073aff162d7
Joe Fernandez [Wed, 26 Apr 2017 05:58:34 +0000 (22:58 -0700)]
docs: Update ProgressBar JavaDoc comments
- link to material design guidelines for a visual example of
determinate/indeterminate patterns
- reword introduction for clarity
- remove confusing code example, in favor of a concise explanation of
determinate/indeterminate uses
- adds a note about not using progress bar in a dialog
Test: docs change only. Tested with a docs build
Change-Id: I872f7a647eafa6d0f1652549ad2d9d2db4fc81e3
Joe Fernandez [Wed, 26 Apr 2017 05:28:27 +0000 (22:28 -0700)]
docs: Update RelativeLayout.LayoutParams JavaDoc comments
Added changes to make purpose/usage of RelativeLayout.LayoutParams more
clear:
- clarify the attributes are set on a view contained in a relative layout
- clarify that relative layout uses these values to position the view
- add note that these values are ignored if view is not contained in a
relative layout
- cross-link code sample in Relative Layout guide
- cross-link guide Layout guide to clarify layout params vs regular
attributes
Test: docs change only. Tested with a docs test build.
Change-Id: I4fe1088594c998cee4ff0b2f6295579956c19d6f