OSDN Git Service
TreeHugger Robot [Mon, 24 Apr 2017 13:41:41 +0000 (13:41 +0000)]
Merge "Follow-up for I8cbf1bfbebc917b03f528f040bb019d193228bbb" into oc-dev
TreeHugger Robot [Mon, 24 Apr 2017 13:37:37 +0000 (13:37 +0000)]
Merge "Call removeMessages() only for certain operations in BackupManagerService#handleCancel()" into oc-dev
TreeHugger Robot [Mon, 24 Apr 2017 13:36:28 +0000 (13:36 +0000)]
Merge "Send directed broadcast to the installer" into oc-dev
Jason Monk [Mon, 24 Apr 2017 13:22:13 +0000 (13:22 +0000)]
Merge "Fix cast dialog dismiss on home/recents" into oc-dev
Jason Monk [Mon, 24 Apr 2017 13:20:36 +0000 (13:20 +0000)]
Merge "Fix QS size on 320dp with big fonts" into oc-dev
Jason Monk [Mon, 24 Apr 2017 13:19:38 +0000 (13:19 +0000)]
Merge "Don't reinflate signal cluster after inflate" into oc-dev
Jason Monk [Mon, 24 Apr 2017 13:19:29 +0000 (13:19 +0000)]
Merge "Fix QS detail panels RTL" into oc-dev
Jason Monk [Mon, 24 Apr 2017 12:53:34 +0000 (12:53 +0000)]
Merge "Fix QS shadow disappearing on expand." into oc-dev
Anton Philippov [Mon, 24 Apr 2017 10:07:54 +0000 (11:07 +0100)]
Call removeMessages() only for certain operations in BackupManagerService#handleCancel()
Only remove messages of types OP_TYPE_BACKUP_WAIT and OP_TYPE_RESTORE_WAIT, since OP_TYPE_BACKUP cannot time out and doesn't require cancellation.
This will prevent some unncecessary (false) warnings in logcat.
Bug:
36570881
Test: manual
Change-Id: I72ecf98438fff18616354b04638b7db5c943aa61
Nicolas Geoffray [Fri, 21 Apr 2017 14:41:13 +0000 (15:41 +0100)]
Drop REASON_FORCED_DEXOPT.
This can already be configured with the default compiler filter.
Also remove unused performDexOptIfNeeded.
bug:
35794392
Test: device boots, forced dexopt works.
Change-Id: I14fc86c4783b2d7ac9cf8972b6619ba303e79659
(cherry picked from commit
e103256c1fee6b53ead10efe13ca35ad270626fa)
TreeHugger Robot [Mon, 24 Apr 2017 09:45:33 +0000 (09:45 +0000)]
Merge "Add log before doRestoreFinished is called on BackupAgent." into oc-dev
TreeHugger Robot [Sun, 23 Apr 2017 02:42:43 +0000 (02:42 +0000)]
Merge "Move settingslib overlays to framework-res." into oc-dev
Jeff Sharkey [Sat, 22 Apr 2017 19:11:30 +0000 (19:11 +0000)]
Merge "More auto-doc work." into oc-dev
TreeHugger Robot [Sat, 22 Apr 2017 09:42:45 +0000 (09:42 +0000)]
Merge "Clarify IControlsTethering LOCAL_ONLY state name" into oc-dev
TreeHugger Robot [Sat, 22 Apr 2017 09:00:07 +0000 (09:00 +0000)]
Merge "Watchdog: add graphics composer to HALs of interest" into oc-dev
TreeHugger Robot [Sat, 22 Apr 2017 04:20:37 +0000 (04:20 +0000)]
Merge "Clarify the meaning of ViewNodes methods used for Autofill purposes." into oc-dev
TreeHugger Robot [Sat, 22 Apr 2017 03:50:00 +0000 (03:50 +0000)]
Merge "Show new colored icon for PDF printer" into oc-dev
TreeHugger Robot [Sat, 22 Apr 2017 02:53:06 +0000 (02:53 +0000)]
Merge "Added accessibility type on Autofill save dialog." into oc-dev
TreeHugger Robot [Sat, 22 Apr 2017 02:41:50 +0000 (02:41 +0000)]
Merge "Workaround apps that override surfaceCreated" into oc-dev
TreeHugger Robot [Sat, 22 Apr 2017 02:32:34 +0000 (02:32 +0000)]
Merge "Fix a spelling." into oc-dev
Sudheer Shanka [Sat, 22 Apr 2017 01:31:18 +0000 (01:31 +0000)]
Merge "Don't clear restart counter when bringing up the service." into oc-dev
TreeHugger Robot [Sat, 22 Apr 2017 01:26:08 +0000 (01:26 +0000)]
Merge "Upgrade logging for UsbDeviceManager to narrow down bugs." into oc-dev
Andrii Kulian [Sat, 22 Apr 2017 00:59:31 +0000 (00:59 +0000)]
Merge "Don't put non-resizeable activities on secondary displays" into oc-dev
Sudheer Shanka [Sat, 22 Apr 2017 00:34:36 +0000 (00:34 +0000)]
Merge "Fix flaky tests in ConnOnActivityStartTest." into oc-dev
Dianne Hackborn [Sat, 22 Apr 2017 00:33:43 +0000 (00:33 +0000)]
Merge "Address various JobScheduler API feedback." into oc-dev
TreeHugger Robot [Sat, 22 Apr 2017 00:17:24 +0000 (00:17 +0000)]
Merge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into oc-dev
John Reck [Sat, 22 Apr 2017 00:14:45 +0000 (17:14 -0700)]
Workaround apps that override surfaceCreated
Fixes:
34512969
Test: manual, tested repro in bug and verified
basic GLSurfaceView usage in ApiDemos works
without warnings
Change-Id: I0ce9128874af681e9cfbd3b0b2ef5e2df7080154
TreeHugger Robot [Fri, 21 Apr 2017 23:50:03 +0000 (23:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 23:40:24 +0000 (23:40 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" 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
Jerry Zhang [Fri, 21 Apr 2017 19:31:17 +0000 (12:31 -0700)]
Upgrade logging for UsbDeviceManager to narrow down bugs.
Will be reverted once bugs are caught.
Bug:
34873000
Test: None
Change-Id: Ia43e0ccb1c22c767c6ef3edbf04cef024662cd15
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
TreeHugger Robot [Fri, 21 Apr 2017 22:35:49 +0000 (22:35 +0000)]
Merge "Propagate density through AdaptiveIconDrawable and BitmapDrawable" into oc-dev
Jeff Sharkey [Fri, 21 Apr 2017 22:29:27 +0000 (16:29 -0600)]
More auto-doc work.
Add support for AnyThread, CallSuper, and UiThread.
Another related CL started documenting @RequiresPermission, so remove
duplicated information in existing APIs.
Suppress auto-doc on a handful of classes that are already
well-documented.
Test: make -j32 offline-sdk-docs
Bug:
37526420
Change-Id: I791437dccec0f11d5349a23b982ba098cb551af8
TreeHugger Robot [Fri, 21 Apr 2017 22:27:43 +0000 (22:27 +0000)]
Merge "Let unlocked profile verifyCredential under unified lock" into oc-dev
Stanley Tng [Tue, 18 Apr 2017 05:35:45 +0000 (22:35 -0700)]
Allow the Bluetooth MAC address to be updated asynchronously (2/3)
There are intermittent issues where either the returned Bluetooth
MAC address to Java framework is uninitialized or this address update
arrives too late. This fix will do 2 things:
(1) Returns error when MAC address is unavailable in the native code.
(2) Updates the MAC address later by adding a new broadcast event.
Test: Check address for these cases: factory reset, system reboot, and
Bluetooth re-enable.
Bug:
36709382
Change-Id: I09720193e38fdf9139e1bb146f8e1847e2b65b1a
(cherry picked from commit
ad4d1d8e28618546953e75d4983335631feb6f2a)
Philip P. Moltmann [Thu, 20 Apr 2017 22:46:19 +0000 (15:46 -0700)]
Show new colored icon for PDF printer
The color matches the color of the printers reported by the Default
Print Service.
Change-Id: I12c19ab498fc5df3af88932eaeb6b3f7015e71d9
Fixes:
35766257
Test: Looked at Print UI
Dianne Hackborn [Fri, 21 Apr 2017 21:17:23 +0000 (14:17 -0700)]
Address various JobScheduler API feedback.
- New sample code.
- Fix/improve some docs.
- Hide JobWorkItem Parcl constructor.
Also:
- Add new JobWorkItem API to get the number of times it has been
delivered.
- Do a bit more optimization of checking if a job is ready.
Bug:
37534393 API Review: JobInfo.Builder
Bug:
37544057 API Review: JobServiceEngine
Bug:
37544153 API Review: JobWorkItem
Test: bit CtsJobSchedulerTestCases:*
Change-Id: I66891a038fba752f45dcaed43e615fa9209b71fc
TreeHugger Robot [Fri, 21 Apr 2017 21:31:13 +0000 (21:31 +0000)]
Merge "Introduce TextView attribute for control justification." into oc-dev
Hassan Shojania [Fri, 21 Apr 2017 21:28:34 +0000 (21:28 +0000)]
Merge "Fix for MediaPlayerStreamingStressTest/HLS" 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
TreeHugger Robot [Fri, 21 Apr 2017 21:22:05 +0000 (21:22 +0000)]
Merge "Renaming intent action for unknown sources" 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
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
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
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
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
TreeHugger Robot [Fri, 21 Apr 2017 20:43:45 +0000 (20:43 +0000)]
Merge "audio service: simplify becoming noisy intent logic" into oc-dev
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)
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
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
TreeHugger Robot [Fri, 21 Apr 2017 20:20:03 +0000 (20:20 +0000)]
Merge "Move PackageManager to new auto-doc feature!" into oc-dev
Sudheer Shanka [Thu, 20 Apr 2017 23:57:50 +0000 (16:57 -0700)]
Don't clear restart counter when bringing up the service.
There is no need for clearing the restart counter when bringing
up the service. If the service is being started because of rescheduling,
then we need to keep track of the counter and shouldn't clear it.
And if it is being started because some other process invoked
startService/bindService, then it needs to be cleared and we already do that
in unscheduleServiceRestartLocked. Also, update the condition for
checking if the service is waiting to restart since +ve restartDelay
doesn't always mean that the service is waiting to restart.
Bug:
36576035
Test: manual &&
cts-tradefed run singleCommand cts-dev -m CtsAppTestCases -t android.app.cts.ServiceTest
cts-tradefed run singleCommand cts-dev -m CtsAppTestCases -t android.app.cts.ActivityManagerTest
cts-tradefed run singleCommand cts-dev -m CtsAppTestCases -t android.app.cts.IntentServiceTest
Change-Id: I95b8adc84ef1918fd7dce727a87b71e2561b0938
Todd Kennedy [Fri, 21 Apr 2017 14:26:25 +0000 (07:26 -0700)]
Send directed broadcast to the installer
The installer of record should be allowed background execution when
an application is removed/updated. The installer of record is the
installer that was responsible for installing the latest version of
the application.
Change-Id: I19ed0120975e6f75ac7e4982b21dd4785552a9e7
Fixes:
36788678
Test: Manual; install an app via 'adb' and set the installer, see that the installer gets the directed broadcast when the app is removed/replaced
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
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
TreeHugger Robot [Fri, 21 Apr 2017 19:29:03 +0000 (19:29 +0000)]
Merge "Add transfer mode support to ColorDrawable" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 19:28:24 +0000 (19:28 +0000)]
Merge "Update HardwareBuffer API." 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
TreeHugger Robot [Fri, 21 Apr 2017 18:53:15 +0000 (18:53 +0000)]
Merge "Fine tune the Autofill Save UI" 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
Felipe Leme [Fri, 21 Apr 2017 18:29:30 +0000 (11:29 -0700)]
Clarify the meaning of ViewNodes methods used for Autofill purposes.
Test: m update-api
Bug:
37565909
Change-Id: I8abcc76193876b62726acb274c5e8984e9dbe6a7
TreeHugger Robot [Fri, 21 Apr 2017 18:38:19 +0000 (18:38 +0000)]
Merge "Match AHardwareBuffer format name change" 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
TreeHugger Robot [Fri, 21 Apr 2017 18:34:08 +0000 (18:34 +0000)]
Merge "docs: Update TextView JavaDoc comments" into oc-dev
fionaxu [Thu, 20 Apr 2017 00:43:48 +0000 (17:43 -0700)]
telephony service support notification channel
Bug:
37475310
Test: Manual
Change-Id: I662d2d29cfb9a0ba47ae25de2332a906bb50ff85
Chia-I Wu [Fri, 21 Apr 2017 18:14:22 +0000 (11:14 -0700)]
Watchdog: add graphics composer to HALs of interest
Bug:
37152880
Test: adb shell am hang --allow-restart
Change-Id: Ic380da057f6f7529a9296cf32f46064c995b0caa
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
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
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
TreeHugger Robot [Fri, 21 Apr 2017 18:00:51 +0000 (18:00 +0000)]
Merge "Cache the Typeface based on the FontRequest." into oc-dev
Hassan Shojania [Fri, 21 Apr 2017 17:33:02 +0000 (10:33 -0700)]
Fix for MediaPlayerStreamingStressTest/HLS
Bug:
32117460
Test: Manual
Change-Id: Ifd7155932f4ae0ebce6bc94740f0eb55092b9fac
Sudheer Shanka [Fri, 21 Apr 2017 01:54:08 +0000 (18:54 -0700)]
Fix a spelling.
Bug:
37419581
Test: N/A
Change-Id: Ia647911524f0a2ebc304e46753a2299bbdd61617
Rebecca Silberstein [Fri, 21 Apr 2017 17:33:41 +0000 (17:33 +0000)]
Merge "WifiManager: add new methods to start softap" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 17:28:09 +0000 (17:28 +0000)]
Merge "Removed deprecated SaveInfo methods." 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
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
Johan Torås Halseth [Fri, 21 Apr 2017 17:00:28 +0000 (18:00 +0100)]
Add log before doRestoreFinished is called on BackupAgent.
This is added because only logging before doRestore was previously
shown, which meant that if the doRestoreFinished timed out, it would
in the logs look like it was the doRestore timing out.
Test: adb shell bmgr restore com.android.calllogbackup
Bug:
36507762
Change-Id: I2bd6e59ed0c5b0128eaca41b627356d459000065
Jason Monk [Fri, 21 Apr 2017 16:51:18 +0000 (12:51 -0400)]
Fix cast dialog dismiss on home/recents
Listen for ACTION_CLOSE_SYSTEM_DIALOGS and dismiss.
Test: manual
Change-Id: I5b4c8f54e451d0042dc498a24bc329d536692a92
Fixes:
37517281
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
TreeHugger Robot [Fri, 21 Apr 2017 16:43:20 +0000 (16:43 +0000)]
Merge "Move companion device check to the handler" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 16:35:02 +0000 (16:35 +0000)]
Merge "QS + DND interaction again" 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
TreeHugger Robot [Fri, 21 Apr 2017 16:21:57 +0000 (16:21 +0000)]
Merge "Import translations. DO NOT MERGE" 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
TreeHugger Robot [Fri, 21 Apr 2017 16:12:22 +0000 (16:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
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
Felipe Leme [Fri, 21 Apr 2017 15:47:50 +0000 (08:47 -0700)]
Added accessibility type on Autofill save dialog.
Fixes:
34219631
Test: CtsAutoFillServiceTestCases pass
Change-Id: I19087c57268c05004df91e4262a17db3743947e6
Jason Monk [Fri, 21 Apr 2017 15:51:17 +0000 (11:51 -0400)]
Fix QS size on 320dp with big fonts
Test: visual
Change-Id: Id87425ba06962c4028374fdb71f2b996a4e966aa
Fixes:
37561810
Jason Monk [Fri, 21 Apr 2017 15:41:41 +0000 (11:41 -0400)]
Fix QS detail panels RTL
Test: visual
Change-Id: I74c867b7f865b1f5fcffcb7b3e6f3c0426975fbc
Fixes:
37543894
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
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
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
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
Jason Monk [Fri, 21 Apr 2017 14:10:35 +0000 (10:10 -0400)]
Don't reinflate signal cluster after inflate
Its not necessary because it was just inflated and it makes the
bar controller lose reference to the one on screen.
Test: manual
Change-Id: I2b8dccc197ec66043547a0cb315ede3125cca0ed
Fixes:
37362330
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
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
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
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
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