OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 23:50:03 +0000 (23:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

7 years agoMerge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 23:40:24 +0000 (23:40 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" into oc-dev

7 years agoMerge "Fix @throws javadoc on SurfaceTexture ctors" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 23:25:48 +0000 (23:25 +0000)]
Merge "Fix @throws javadoc on SurfaceTexture ctors" into oc-dev

7 years agoMerge "Behavior compat for child being manipulated outside Animatorset" into oc-dev
Doris Liu [Fri, 21 Apr 2017 23:14:28 +0000 (23:14 +0000)]
Merge "Behavior compat for child being manipulated outside Animatorset" into oc-dev

7 years agoMerge "Propagate density through AdaptiveIconDrawable and BitmapDrawable" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 22:35:49 +0000 (22:35 +0000)]
Merge "Propagate density through AdaptiveIconDrawable and BitmapDrawable" into oc-dev

7 years agoMerge "Let unlocked profile verifyCredential under unified lock" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 22:27:43 +0000 (22:27 +0000)]
Merge "Let unlocked profile verifyCredential under unified lock" into oc-dev

7 years agoMerge "Introduce TextView attribute for control justification." into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 21:31:13 +0000 (21:31 +0000)]
Merge "Introduce TextView attribute for control justification." into oc-dev

7 years agoMerge "Fix for MediaPlayerStreamingStressTest/HLS" into oc-dev
Hassan Shojania [Fri, 21 Apr 2017 21:28:34 +0000 (21:28 +0000)]
Merge "Fix for MediaPlayerStreamingStressTest/HLS" into oc-dev

7 years agoMerge "telephony service support notification channel" into oc-dev
Chen Xu [Fri, 21 Apr 2017 21:26:26 +0000 (21:26 +0000)]
Merge "telephony service support notification channel" into oc-dev

7 years agoMerge "Renaming intent action for unknown sources" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 21:22:05 +0000 (21:22 +0000)]
Merge "Renaming intent action for unknown sources" into oc-dev

7 years agoMerge "Add more log to track down the "idle until changed" issue." into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 21:20:24 +0000 (21:20 +0000)]
Merge "Add more log to track down the "idle until changed" issue." into oc-dev

7 years agoIntroduce TextView attribute for control justification.
Seigo Nonaka [Fri, 21 Apr 2017 17:16:26 +0000 (10:16 -0700)]
Introduce TextView attribute for control justification.

Bug: 37447278
Test: am instrument -w -e class android.widget.cts.TextViewTest
      android.widget.cts/android.support.test.runner.AndroidJUnitRunner
Change-Id: I7946f460ad8a6c2423b464c27225411d155d4d8d

7 years agoBehavior compat for child being manipulated outside Animatorset
Doris Liu [Fri, 21 Apr 2017 19:24:54 +0000 (12:24 -0700)]
Behavior compat for child being manipulated outside Animatorset

When a child animator is being manipulated outside of the AnimatorSet,
such as when the child animator is running before the AnimatorSet gets
started, we need to make sure we maintain the behavoir on N:
The child animator will be re-started at its scheduled start time in
the AnimatorSet.

BUG: 37507882
Test: Repro steps in comment #1 & ag/2144081/
Change-Id: Ib97e85706f01d18a2e72fb4d1d678e22cf959894

7 years agoMerge "MediaPlayer: fix new API seekTo to address API review." into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 21:10:47 +0000 (21:10 +0000)]
Merge "MediaPlayer: fix new API seekTo to address API review." into oc-dev

7 years agoFix @throws javadoc on SurfaceTexture ctors
John Reck [Fri, 21 Apr 2017 17:50:59 +0000 (10:50 -0700)]
Fix @throws javadoc on SurfaceTexture ctors

Change-Id: I63bd76ec4e44251b7e06ad6fc8aa5a3372104656
Fixes: 37323694
Test: Looked at generated docs, verified correct

7 years agoMerge "audio service: simplify becoming noisy intent logic" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 20:43:45 +0000 (20:43 +0000)]
Merge "audio service: simplify becoming noisy intent logic" into oc-dev

7 years agoBluetooth: improve getLeMaximumAdvertisingDataLength comment
Jakub Pawlowski [Fri, 21 Apr 2017 11:59:55 +0000 (04:59 -0700)]
Bluetooth: improve getLeMaximumAdvertisingDataLength comment

Bug: 37534792
Test: none
Change-Id: Ieff71356aceb0e2a4c6e81d9053f854448e0c927
(cherry picked from commit 4634b5cd27b274105e550f58f9d5fc51c79eb3fb)

7 years agoMerge "Increases the minimized width in landscape by statusbar height" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 20:30:46 +0000 (20:30 +0000)]
Merge "Increases the minimized width in landscape by statusbar height" into oc-dev

7 years agoPropagate density through AdaptiveIconDrawable and BitmapDrawable
Adam Lesinski [Sat, 15 Apr 2017 01:41:52 +0000 (18:41 -0700)]
Propagate density through AdaptiveIconDrawable and BitmapDrawable

Resources#getDrawableForDensity now propagates the overridden
density through to AdaptiveIconDrawable so that the density can be
propagated to leaf BitmapDrawables correctly.

This enables AdaptiveIconDrawable to support higher resolution
foreground/background bitmaps for use in Launcher.

Bug: 36039665
Test: bit CtsContentTestCases:android.content.res.cts.ResourcesTest
Change-Id: Iaa9a5592626e38e1ff839a76f7c6cfb9e16e5dc1

7 years agoMerge "Move PackageManager to new auto-doc feature!" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 20:20:03 +0000 (20:20 +0000)]
Merge "Move PackageManager to new auto-doc feature!" into oc-dev

7 years agoMerge "Fix code accounting bugs, track external app data." into oc-dev
Jeff Sharkey [Fri, 21 Apr 2017 20:01:36 +0000 (20:01 +0000)]
Merge "Fix code accounting bugs, track external app data." into oc-dev

7 years agoAdd more log to track down the "idle until changed" issue.
Makoto Onuki [Fri, 21 Apr 2017 19:21:25 +0000 (12:21 -0700)]
Add more log to track down the "idle until changed" issue.

Bug 34724174
Test: Tested manually with intentionally adding a bug.

Change-Id: I1789285068203b22ce271180667eb9cb1eb0b182

7 years agoMerge "Add transfer mode support to ColorDrawable" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 19:29:03 +0000 (19:29 +0000)]
Merge "Add transfer mode support to ColorDrawable" into oc-dev

7 years agoMerge "Update HardwareBuffer API." into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 19:28:24 +0000 (19:28 +0000)]
Merge "Update HardwareBuffer API." into oc-dev

7 years agoMerge "Fix issue #32180780: Sync adapters inappropriately being run..." into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 19:23:06 +0000 (19:23 +0000)]
Merge "Fix issue #32180780: Sync adapters inappropriately being run..." into oc-dev

7 years agoMerge "Fine tune the Autofill Save UI" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 18:53:15 +0000 (18:53 +0000)]
Merge "Fine tune the Autofill Save UI" into oc-dev

7 years agoMerge "Switched wtf in DimLayerController to warning instead" into oc-dev
Wale Ogunwale [Fri, 21 Apr 2017 18:52:41 +0000 (18:52 +0000)]
Merge "Switched wtf in DimLayerController to warning instead" into oc-dev

7 years agoMerge "Match AHardwareBuffer format name change" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 18:38:19 +0000 (18:38 +0000)]
Merge "Match AHardwareBuffer format name change" into oc-dev

7 years agoMerge "docs: Update Imageview JavaDoc comments" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 18:36:46 +0000 (18:36 +0000)]
Merge "docs: Update Imageview JavaDoc comments" into oc-dev

7 years agoMerge "docs: Update TextView JavaDoc comments" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 18:34:08 +0000 (18:34 +0000)]
Merge "docs: Update TextView JavaDoc comments" into oc-dev

7 years agotelephony service support notification channel
fionaxu [Thu, 20 Apr 2017 00:43:48 +0000 (17:43 -0700)]
telephony service support notification channel

Bug: 37475310
Test: Manual
Change-Id: I662d2d29cfb9a0ba47ae25de2332a906bb50ff85

7 years agoMove PackageManager to new auto-doc feature!
Jeff Sharkey [Fri, 21 Apr 2017 18:08:39 +0000 (12:08 -0600)]
Move PackageManager to new auto-doc feature!

Test: make -j32 offline-sdk-docs
Bug: 37526420
Change-Id: Ib368042e91be3ed702ede0facaf5c8d8d28853d4

7 years agoMediaPlayer: fix new API seekTo to address API review.
Wei Jia [Wed, 19 Apr 2017 23:22:10 +0000 (16:22 -0700)]
MediaPlayer: fix new API seekTo to address API review.

Test: compiles
Bug: 36790516
Bug: 37514763
Change-Id: I91307d10e6c9bc65779651c056053b3a025b0d50

7 years agoMerge "Removes colon characters from the doc of EXTRA_CONTENT_ANNOTATIONS." into...
TreeHugger Robot [Fri, 21 Apr 2017 18:03:06 +0000 (18:03 +0000)]
Merge "Removes colon characters from the doc of EXTRA_CONTENT_ANNOTATIONS." into oc-dev

7 years agoMerge "Cache the Typeface based on the FontRequest." into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 18:00:51 +0000 (18:00 +0000)]
Merge "Cache the Typeface based on the FontRequest." into oc-dev

7 years agoFix for MediaPlayerStreamingStressTest/HLS
Hassan Shojania [Fri, 21 Apr 2017 17:33:02 +0000 (10:33 -0700)]
Fix for MediaPlayerStreamingStressTest/HLS

Bug: 32117460
Test: Manual
Change-Id: Ifd7155932f4ae0ebce6bc94740f0eb55092b9fac

7 years agoMerge "WifiManager: add new methods to start softap" into oc-dev
Rebecca Silberstein [Fri, 21 Apr 2017 17:33:41 +0000 (17:33 +0000)]
Merge "WifiManager: add new methods to start softap" into oc-dev

7 years agoMerge "Removed deprecated SaveInfo methods." into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 17:28:09 +0000 (17:28 +0000)]
Merge "Removed deprecated SaveInfo methods." into oc-dev

7 years agoMerge "Remove long standing debug code" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 17:17:17 +0000 (17:17 +0000)]
Merge "Remove long standing debug code" into oc-dev

7 years agoFix issue #32180780: Sync adapters inappropriately being run...
Dianne Hackborn [Fri, 21 Apr 2017 00:17:48 +0000 (17:17 -0700)]
Fix issue #32180780: Sync adapters inappropriately being run...

...during full-data backup/restore

The activity manager now tells job scheduler service about the
current backup that is running (only if it is a full backup), it
there is a new condition where we won't consider jobs associated
with the current backup to be ready to run.

Also...  just a little optimization here. :)  The focus is on
scheduling  jobs with a 0 deadline, meaning they should run right
away.  Now the timing controller does a quick check for a new
job to see if its constraints are already satisifed, and doesn't
do anything further if that is the case (doesn't add to the list,
doesn't re-evaluate alarms, etc).  And in the path to scheduling
a job, we do a check to see if the new job is already ready and if
so then just directly add it to the pending list and schedule it.

Doing this required removing what I think is the last bit of code
relying on handler serializing for thread safety, so now everything
in the job scheduler is protected by our global lock and we can
do whatever we want with the lock held and be assured the state
remains consistent.

Also did some small optimizations to many of the other controllers,
mostly switching from an ArrayList to an ArraySet for their tracked
jobs, since one of the things we do frequently is add/remove jobs.

Finally, added some nullability annotations to the JobScheduler
APIs.

Test: bit CtsJobSchedulerTestCases:*

Change-Id: I533fad94ba59468a52fe3d077a0ceab3427f0012

7 years agoMerge "Send ACTION_POWER_SAVE_MODE_CHANGED to all user" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 16:44:44 +0000 (16:44 +0000)]
Merge "Send ACTION_POWER_SAVE_MODE_CHANGED to all user" into oc-dev

7 years agoMerge "Move companion device check to the handler" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 16:43:20 +0000 (16:43 +0000)]
Merge "Move companion device check to the handler" into oc-dev

7 years agoMerge "QS + DND interaction again" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 16:35:02 +0000 (16:35 +0000)]
Merge "QS + DND interaction again" into oc-dev

7 years agoMerge "Fix javadoc for some user restrictions." into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 16:28:45 +0000 (16:28 +0000)]
Merge "Fix javadoc for some user restrictions." into oc-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 16:21:57 +0000 (16:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

7 years agoMerge "Ignore request to add starting window if already visible" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 16:16:43 +0000 (16:16 +0000)]
Merge "Ignore request to add starting window if already visible" into oc-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 16:12:22 +0000 (16:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

7 years agoCache the Typeface based on the FontRequest.
Seigo Nonaka [Wed, 19 Apr 2017 19:16:39 +0000 (12:16 -0700)]
Cache the Typeface based on the FontRequest.

Bug: 37471729
Test: FontsContractE2ETest
Change-Id: Ifb1bd2b50077471404f5f1dffc01e7697d7042e6

7 years agoRemoved deprecated SaveInfo methods.
Felipe Leme [Fri, 21 Apr 2017 15:08:39 +0000 (08:08 -0700)]
Removed deprecated SaveInfo methods.

Test: CtsAutoFillServiceTestCases pass
Bug: 37563972
Bug: 33197203

Change-Id: Ie90fa78c31f033c47e7b2f018355ae87759c622b

7 years agoRemoves colon characters from the doc of EXTRA_CONTENT_ANNOTATIONS.
Kang Li [Wed, 19 Apr 2017 18:56:05 +0000 (11:56 -0700)]
Removes colon characters from the doc of EXTRA_CONTENT_ANNOTATIONS.

bug: 37496130

Test: skipped test, because the change is only in javadoc.

Change-Id: I899d55da59260eabfcea0549a1c6a338bcda2c81

7 years agoMerge "Support fraction type for inset* for InsetDrawable. b/36024318" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 15:14:18 +0000 (15:14 +0000)]
Merge "Support fraction type for inset* for InsetDrawable. b/36024318" into oc-dev

7 years agoMerge "Fix/suppress error-prone warnings in framework's fragment." into oc-dev
Aurimas Liutikas [Fri, 21 Apr 2017 15:14:04 +0000 (15:14 +0000)]
Merge "Fix/suppress error-prone warnings in framework's fragment." into oc-dev

7 years agoFix javadoc for some user restrictions.
Pavel Grafov [Fri, 21 Apr 2017 13:48:21 +0000 (14:48 +0100)]
Fix javadoc for some user restrictions.

DISALLOW_UNMUTE_MICROPHONE and DISALLOW_ADJUST_VOLUME can
be set by POs on secondary users as well. But they have no
effect on managed profiles.

(In the bug I erroneously mentionted DISALLOW_UNMUTE_DEVICE
which is @hidden instead of *_MICROPHONE).

Bug: 36024135
Test: IntelliJ quickdoc popup renders correctly.
Change-Id: I7a0e77ac993846cdc3a4ddf4d457e1282872107f

7 years agoMove companion device check to the handler
Julia Reynolds [Thu, 20 Apr 2017 15:31:30 +0000 (11:31 -0400)]
Move companion device check to the handler

To return faster to the app that's creating channels, since
companion device manager has to read from xml.

Fixes: 37534164
Test: runtest systemui-notification, manual with an app with strict
mode on.

Change-Id: I78909ba3ca6b33302fb78756b49c9014de5aeb12

7 years agoRemove long standing debug code
Julia Reynolds [Wed, 19 Apr 2017 17:50:12 +0000 (13:50 -0400)]
Remove long standing debug code

Because it stops real errors from bubbling up to the calling app.

Test: make, post notifications
Change-Id: I0e59c61b0a60302a5fd023b7ad909e84b97e5df5
Fixes: 37494547

7 years agoLet unlocked profile verifyCredential under unified lock
Charles He [Fri, 21 Apr 2017 12:45:34 +0000 (13:45 +0100)]
Let unlocked profile verifyCredential under unified lock

When unified work challenge is enabled and the primary user is unlocked,
LockSettingsService should unlock the managed profile subsequently by
calling verifyCredential() in most cases.  Previously,
verifyCredential() is not called on managed profiles when any one of the
two conditions are met:
  1. when the profile is not yet running
  2. when the profile is already unlocked
These were introduced to make sure the managed profile stays locked when
it is in QUIET_MODE (i.e. work mode off).

However, condition 2 is problematic. Specifically, it also prevents auth
tokens, etc., from being refreshed (side effects of verifyCredential()),
even when the profile is not in QUIET_MODE.

We remove condition 2 in this change to make sure verifyCredential() is
still called on the managed profile when it is RUNNING_UNLOCKED.
Condition 1 alone should be able to handle the QUIET_MODE case.  Unit
test is also updated in case regression occurs.

Bug: 36851574
Test: runtest frameworks-services -c com.android.server.LockSettingsServiceTests
Test: runtest frameworks-services -c com.android.server.SyntheticPasswordTests
Test: CTS verifier > BYOD managed provisioning > Authentication-bound keys
Test: (all of above are run on both sailfish and angler)
Change-Id: Ice89c1eedacaf07e076252a2a571a1eb100ef791

7 years agoMerge "[DO NOT MERGE] Fix potential NPE in Trampoline.requestBackup()." into oc-dev
Michal Karpinski [Fri, 21 Apr 2017 12:20:58 +0000 (12:20 +0000)]
Merge "[DO NOT MERGE] Fix potential NPE in Trampoline.requestBackup()." into oc-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 21 Apr 2017 11:21:57 +0000 (04:21 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ida4d17127df81670a51a4bf933d8df61729fa2c4
Auto-generated-cl: translation import

7 years agoMerge "SmartSelection ConfigUpdater: Ignore version numbers" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 11:05:45 +0000 (11:05 +0000)]
Merge "SmartSelection ConfigUpdater: Ignore version numbers" into oc-dev

7 years ago[DO NOT MERGE] Fix potential NPE in Trampoline.requestBackup().
Artem Iglikov [Fri, 21 Apr 2017 08:50:56 +0000 (09:50 +0100)]
[DO NOT MERGE] Fix potential NPE in Trampoline.requestBackup().

Before it was returning null in case the service was not initialized,
but as the method signature has int as the return type, this was boxed
and unboxed which would cause NPE.

Now it will return BackupManager.ERROR_BACKUP_NOT_ALLOWED instead.

This doesn't include fix for the test, because it's going to be
cherry-picked into oc-dev, which doesn't have the tests.

Test: manually ran unit tests

Bug: 37535747

Change-Id: I186cf812a4ec67be943b5c4334c82e9af5320b7a

7 years agoMerge "Update Typeface callback docs about error codes" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 09:44:48 +0000 (09:44 +0000)]
Merge "Update Typeface callback docs about error codes" into oc-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 21 Apr 2017 09:42:01 +0000 (02:42 -0700)]
Import translations. DO NOT MERGE

Change-Id: I231c6c8609a64f510f3902840053fb056a7e8509
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 21 Apr 2017 09:28:42 +0000 (02:28 -0700)]
Import translations. DO NOT MERGE

Change-Id: I5b2719e883b4578dc7cc3d7ec772e16084d0eef7
Auto-generated-cl: translation import

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 07:57:49 +0000 (07:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

7 years agoMerge "Add local-only hotspot info into tether state change broadcast" into oc-dev
Erik Kline [Fri, 21 Apr 2017 06:53:32 +0000 (06:53 +0000)]
Merge "Add local-only hotspot info into tether state change broadcast" into oc-dev

7 years agoMerge "Don't trigger new partition on fields from SaveInfo" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 06:06:49 +0000 (06:06 +0000)]
Merge "Don't trigger new partition on fields from SaveInfo" into oc-dev

7 years agoMerge "Correctly compute visible views" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 05:15:36 +0000 (05:15 +0000)]
Merge "Correctly compute visible views" into oc-dev

7 years agoAdd local-only hotspot info into tether state change broadcast
Erik Kline [Mon, 17 Apr 2017 07:47:23 +0000 (16:47 +0900)]
Add local-only hotspot info into tether state change broadcast

Test: as follows
    - build
    - flashed
    - booted
    - "runtest frameworks-net" passes
    - manually starting tethering shows Settings and icon updates
Bug: 31466854
Bug: 32163131

Change-Id: I938074587dfeec221c5cdb43a392802ad3fc3589

7 years agoMerge "MediaPlayer/ModularDrm API review: Document/runtime exception update" into...
Hassan Shojania [Fri, 21 Apr 2017 02:58:21 +0000 (02:58 +0000)]
Merge "MediaPlayer/ModularDrm API review: Document/runtime exception update" into oc-dev

7 years agoMerge "Implemented FillResponse.setIgnoredIds()." into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 02:54:05 +0000 (02:54 +0000)]
Merge "Implemented FillResponse.setIgnoredIds()." into oc-dev

7 years agoMerge "fix KeyEvent can't correctly finish when inputmethod time out happend" into...
TreeHugger Robot [Fri, 21 Apr 2017 02:36:06 +0000 (02:36 +0000)]
Merge "fix KeyEvent can't correctly finish when inputmethod time out happend" into oc-dev

7 years agoMerge "Stop restoring tasks added before recent is loaded" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 02:12:34 +0000 (02:12 +0000)]
Merge "Stop restoring tasks added before recent is loaded" into oc-dev

7 years agoMerge "media: Change setNextOutputFile to address API review comments." into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 02:06:13 +0000 (02:06 +0000)]
Merge "media: Change setNextOutputFile to address API review comments." into oc-dev

7 years agoMerge "Fix #37305009 : Beam crash in secondary users" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 02:04:12 +0000 (02:04 +0000)]
Merge "Fix #37305009 : Beam crash in secondary users" into oc-dev

7 years agoMerge "Auto-generate docs based on annotations." into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 02:03:29 +0000 (02:03 +0000)]
Merge "Auto-generate docs based on annotations." into oc-dev

7 years agoMerge "Always create display content with system identity" into oc-dev
Andrii Kulian [Fri, 21 Apr 2017 01:52:15 +0000 (01:52 +0000)]
Merge "Always create display content with system identity" into oc-dev

7 years agoMerge "Update ClipDescription.getTimeStamp to use currentTimeMillis timebase." into...
Sudheer Shanka [Fri, 21 Apr 2017 01:51:22 +0000 (01:51 +0000)]
Merge "Update ClipDescription.getTimeStamp to use currentTimeMillis timebase." into oc-dev

7 years agoMerge "OOM-adjust an app to the foreground for startForegroundService" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 01:42:29 +0000 (01:42 +0000)]
Merge "OOM-adjust an app to the foreground for startForegroundService" into oc-dev

7 years agoDon't trigger new partition on fields from SaveInfo
Felipe Leme [Fri, 21 Apr 2017 01:28:27 +0000 (18:28 -0700)]
Don't trigger new partition on fields from SaveInfo

Fixes: 37551943

Test: existing CtsAutoFillServiceTestCases pass
Test: modified LoginActivityTest.testSaveOnly
Test: new LoginActivityTest.testSaveOnlyOptionalField

Change-Id: I2ae11c4f0aebe63fd02f81fbc37466435e3a2820

7 years agoMerge "Fixed NPE on dump() and other minor fixes..." into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 01:20:19 +0000 (01:20 +0000)]
Merge "Fixed NPE on dump() and other minor fixes..." into oc-dev

7 years agoMerge "Fix a11y text location in clipped views" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 01:11:07 +0000 (01:11 +0000)]
Merge "Fix a11y text location in clipped views" into oc-dev

7 years agoImplemented FillResponse.setIgnoredIds().
Felipe Leme [Thu, 20 Apr 2017 22:58:30 +0000 (15:58 -0700)]
Implemented FillResponse.setIgnoredIds().

Fixes: 37424141

Test: existing CtsAutoFillServiceTestCases pass
Test: PartitionedActivityTest.testIgnoredFieldsDontTriggerAutofill

Change-Id: I09bd95230c45d2970080514e25cb53320de49b56

7 years agoMerge "Renaming setAsyncExecutor to setExecutor" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 00:31:05 +0000 (00:31 +0000)]
Merge "Renaming setAsyncExecutor to setExecutor" into oc-dev

7 years agoMerge "browserIntent needs proper flags for PendingIntent" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 00:30:15 +0000 (00:30 +0000)]
Merge "browserIntent needs proper flags for PendingIntent" into oc-dev

7 years agoMerge "Hide API to listen to a11y service state" into oc-dev
Phil Weaver [Fri, 21 Apr 2017 00:11:03 +0000 (00:11 +0000)]
Merge "Hide API to listen to a11y service state" into oc-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 21 Apr 2017 00:02:11 +0000 (17:02 -0700)]
Import translations. DO NOT MERGE

Change-Id: I1add27afc0da8fbc26654fe0b82e194fe5b72514
Auto-generated-cl: translation import

7 years agoCorrectly compute visible views
Philip P. Moltmann [Thu, 20 Apr 2017 22:19:06 +0000 (15:19 -0700)]
Correctly compute visible views

addToSet needs the same set as parameters as it returns. Otherwise the
returned set it overrridden.

In this case only the last visible view was added as the set was
overriden with the invisible views.

Test: CtsAutoFillTestCases
Fixes: 37550229
Change-Id: I80e16cbd8a1af83373d7ea7b0f84a7c4d157119f

7 years agoMerge "Kill running animations on fragment view's when removed." into oc-dev
TreeHugger Robot [Thu, 20 Apr 2017 23:52:41 +0000 (23:52 +0000)]
Merge "Kill running animations on fragment view's when removed." into oc-dev

7 years agoMerge "Execute pending transactions after FM state change." into oc-dev
TreeHugger Robot [Thu, 20 Apr 2017 23:51:03 +0000 (23:51 +0000)]
Merge "Execute pending transactions after FM state change." into oc-dev

7 years agoIgnore request to add starting window if already visible
Wale Ogunwale [Thu, 20 Apr 2017 23:45:13 +0000 (16:45 -0700)]
Ignore request to add starting window if already visible

No need to display a starting winow for an app that already has its
main window visible and drawn.

Test: manual
Change-Id: Ibb6c74d0c5cc91cef335749d7546001fff1f7678
Fixes: 37199644

7 years agoMerge "Added missing important-for-autofill mappings." into oc-dev
TreeHugger Robot [Thu, 20 Apr 2017 23:43:33 +0000 (23:43 +0000)]
Merge "Added missing important-for-autofill mappings." into oc-dev

7 years agoMerge "Deprecate BSSID Hostlist system API" into oc-dev
Michael Plass [Thu, 20 Apr 2017 23:37:47 +0000 (23:37 +0000)]
Merge "Deprecate BSSID Hostlist system API" into oc-dev

7 years agoAlways create display content with system identity
Andrii Kulian [Thu, 20 Apr 2017 23:02:47 +0000 (16:02 -0700)]
Always create display content with system identity

If an app tried to use a virtual display that it had just created
and add a window to it before it was registered in WM, WM would try
to create a DisplayContent instance. This would be executed with
app's calling identity and fail permission check.
This CL ensures that we always clear the calling identity before
creating display content.

Bug: 37422998
Test: android.display.cts.VirtualDisplayTest#testPrivateVirtualDisplay
Change-Id: I442cca65055886b384a28eeefcc35f2a36e482d0

7 years agoRenaming intent action for unknown sources
Suprabh Shukla [Thu, 20 Apr 2017 23:04:26 +0000 (16:04 -0700)]
Renaming intent action for unknown sources

Renaming to maintain consistency with neighboring constants

Test: gts-tradefed run gts GtsExternalSourcesTestCases

Bug:37515311
Change-Id: I5e153d93fce01633ee69363c0725b026f1551b1e

7 years agoFix #37305009 : Beam crash in secondary users
Christopher Tate [Thu, 20 Apr 2017 23:24:31 +0000 (16:24 -0700)]
Fix #37305009 : Beam crash in secondary users

The background-policy check for a-priori app uids needs to be an appId
check rather than nominal uid.

Along the way, even though the code is not invoked after the boot
sequence currently, make the "is this uid on the a-priori list?"
check thread safe.

Bug 37305009
Test: manual

Change-Id: I7c2525f86e73b213057cd4b7f327191ec20c4a6d

7 years agoSupport fraction type for inset* for InsetDrawable.
Hyunyoung Song [Tue, 14 Mar 2017 07:58:33 +0000 (00:58 -0700)]
Support fraction type for inset* for InsetDrawable.
b/36024318

Test: manually tested on default icons.
Test: $ runtest --path=cts/tests/tests/graphics/src/android/graphics/drawable/cts/InsetDrawableTest.java

adb  shell am instrument -e class 'android.graphics.drawable.cts.InsetDrawableTest' -w 'android.graphics.cts/android.support.test.runner.AndroidJUnitRunner'

android.graphics.drawable.cts.InsetDrawableTest:........................

Time: 0.132

OK (26 tests)

Change-Id: Ie8d24680b6884e65017f07723a371120f5ae610c

7 years agoAuto-generate docs based on annotations.
Jeff Sharkey [Thu, 20 Apr 2017 05:24:18 +0000 (23:24 -0600)]
Auto-generate docs based on annotations.

We have a handful of annotations that we've been sprinkling across
the platform APIs, such as @Nullable, @NonNull, @IntDef, etc.  It
would be really helpful to surface these contracts to developers
through the SDK docs.

This change allows annotations like those mentioned above to declare
the following new javadoc fields:

@memberDoc: docs to append to a field or method definition.
@paramDoc: docs to append to a @param definition.
@returnDoc: docs to append to a @return definition.

This change also builds a docstring to describe the list of all
constants listed in an @IntDef annotation.  Sadly AnnotationDesc
only passes along raw constant values, so we need the help of the
new "prefix" annotation argument to help find the field names.

Test: builds
Bug: 37526420
Change-Id: I4cfc00dd904e5dfa945b406d546e36846b7c0c28

7 years agoFixed NPE on dump() and other minor fixes...
Felipe Leme [Thu, 20 Apr 2017 22:46:18 +0000 (15:46 -0700)]
Fixed NPE on dump() and other minor fixes...

Bug: 36871500
Test: manual verification
Change-Id: I1c3a8406344280da37b728eae56f26447c48e0b2

7 years agoUpdate HardwareBuffer API.
Craig Donner [Thu, 20 Apr 2017 01:33:36 +0000 (18:33 -0700)]
Update HardwareBuffer API.

Bug: 37514517
Test: cts-tradefed run cts -t CtsHardwareTestCases -t android.hardware.cts.HardwareBufferTest
Change-Id: I5e381964b780472081ef9a65c3c37f63dbaf1e51

7 years agoWifiManager: add new methods to start softap
Rebecca Silberstein [Thu, 23 Mar 2017 22:05:39 +0000 (15:05 -0700)]
WifiManager: add new methods to start softap

Add two new methods to start/stop softap in WifiService.  These are
internal calls that allow WifiService and ConnectivityService to
coordinate the switch to and from softap mode.  These calls will not be
callable by apps and are protected by the NETWORK_STACK permission.  The
calls are added in this CL, but are not used at this time.

Bug: 36540346
Test: compiles

Change-Id: Idabdba7f779cbac999ff88d8993b2f4b1f4a1624
Merged-In: Idabdba7f779cbac999ff88d8993b2f4b1f4a1624
Merged-In: Ie2476bbae3554bd9fc203c478d25cb2e2898c8e3