OSDN Git Service

android-x86/frameworks-base.git
8 years agoFrameworks/base: Disable Clang in core/jni
Andreas Gampe [Sat, 11 Jul 2015 04:46:17 +0000 (21:46 -0700)]
Frameworks/base: Disable Clang in core/jni

thread_local does not work with Clang at the moment.

Bug: 22414716
Change-Id: I4059b63a1621c346bfc72dbbec0b9cb165485e26
(cherry picked from commit 2bc67a1b5f9d4662ef7da4645ca8e580302b3553)

8 years agoMerge "Pushing the startActivity before the calls to remove task." into mnc-dev
Winson Chung [Tue, 11 Aug 2015 02:33:15 +0000 (02:33 +0000)]
Merge "Pushing the startActivity before the calls to remove task." into mnc-dev

8 years agoMerge "Don't show fingerprint cancellation messages in keyguard" into mnc-dev
Jorim Jaggi [Tue, 11 Aug 2015 01:31:56 +0000 (01:31 +0000)]
Merge "Don't show fingerprint cancellation messages in keyguard" into mnc-dev

8 years agoMerge "Fix issue #23037899: Support for Battery Optimization permission + Dialog...
Dianne Hackborn [Tue, 11 Aug 2015 00:11:20 +0000 (00:11 +0000)]
Merge "Fix issue #23037899: Support for Battery Optimization permission + Dialog" into mnc-dev

8 years agoPushing the startActivity before the calls to remove task.
Winson [Thu, 6 Aug 2015 23:46:01 +0000 (16:46 -0700)]
Pushing the startActivity before the calls to remove task.

- It appears that there is contention between startActivityAsUser() and
  removeTask() (called on two separate threads) which can cause jank when
  a user removes all the tasks from their recents list.  This CL ensures
  that startActivityAsUser() is always run first so it is not blocked
  by the other call (which should be able to run in the background
  uninterrupted).

Bug: 22760556
Change-Id: I7564a2f0e43414686419d3657379bbd0ca6b4152

8 years agoMerge "DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED" into mnc-dev
Matthew Williams [Mon, 10 Aug 2015 22:36:49 +0000 (22:36 +0000)]
Merge "DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED" into mnc-dev

8 years agoMerge "Fix wifi disable during restore" into mnc-dev
Chris Tate [Mon, 10 Aug 2015 22:33:05 +0000 (22:33 +0000)]
Merge "Fix wifi disable during restore" into mnc-dev

8 years agoDO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED
Kevin Zhu [Mon, 29 Jun 2015 23:06:49 +0000 (16:06 -0700)]
DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED

BUG: 23086704
Cherry-picked from https://android-review.googlesource.com/#/c/162280/
When the screen goes off or dreaming start, an alarm will be
scheduled and idle state will be true when the alarm expired.
If the screen goes on or dreaming stop happens before
the alarm expired, the alarm isn't cancelled and idle state is
set to be true when the device is in SCREEN_ON or DREADING_STOPPED
state. There is also a case that Idle alarm triggered when
the screen on or dreaming stop just start to be processed.
ACTION_TRIGGER_IDLE will set mIdle to true during screen on
or dreaming stop.

In this patch, the alarm will be cancelled when the screen goes
on or dreaming stop and screen-on flag will be set. So the idle
state can only be set when screen is off or dreaming started.

Change-Id: Ic21a2394418ca55513ab932b3bfad1126b8769c1

8 years agoFix issue #23037899: Support for Battery Optimization permission + Dialog
Dianne Hackborn [Mon, 10 Aug 2015 21:52:52 +0000 (14:52 -0700)]
Fix issue #23037899: Support for Battery Optimization permission + Dialog

New permission, new Intent action.

Change-Id: I1d9ba55be8f72074e29d33ad7a0a12a820bbac39

8 years agoMerge "[Fix getAccounts MANAGE_USERS permission]" into mnc-dev
Simranjit Kohli [Mon, 10 Aug 2015 21:36:30 +0000 (21:36 +0000)]
Merge "[Fix getAccounts MANAGE_USERS permission]" into mnc-dev

8 years ago[Fix getAccounts MANAGE_USERS permission]
Simranjit Singh Kohli [Sat, 8 Aug 2015 00:07:23 +0000 (17:07 -0700)]
[Fix getAccounts MANAGE_USERS permission]

Make code having potential to call userInfo inside clearIdentity.
Bug: 22917218

Change-Id: If95fb7c0ec36a2f5c737f04bc7d8af95b44fea22

8 years agoClose ZipFiles correctly in WebViewFactory.
Torne (Richard Coles) [Mon, 10 Aug 2015 15:40:50 +0000 (16:40 +0100)]
Close ZipFiles correctly in WebViewFactory.

We weren't closing the ZipFiles created in WebViewFactory to check
inside APKs - use try-with-resources to get them closed automatically.

Bug: 23072621
Change-Id: I11c6b77e960a7d240d19d22240cac177b6ba27b2

8 years agoMerge "Initialize network name better in NetworkController" into mnc-dev
Jason Monk [Mon, 10 Aug 2015 14:50:45 +0000 (14:50 +0000)]
Merge "Initialize network name better in NetworkController" into mnc-dev

8 years agoInitialize network name better in NetworkController
Jason Monk [Mon, 10 Aug 2015 14:12:02 +0000 (10:12 -0400)]
Initialize network name better in NetworkController

Initialize current network name to correct value from the
SubscriptionInfo until we get a broadcast about its current state.

Bug: 22212693
Change-Id: I17fa4378cc7a540c81268f8c4d5aa6a505f3ee40

8 years agoMerge "Filtering Remote-Submix and Back-mic devices from AudioDeviceInfo API." into...
Paul Mclean [Mon, 10 Aug 2015 13:42:15 +0000 (13:42 +0000)]
Merge "Filtering Remote-Submix and Back-mic devices from AudioDeviceInfo API." into mnc-dev

8 years agoMerge "Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test...
Paul Mclean [Mon, 10 Aug 2015 13:40:58 +0000 (13:40 +0000)]
Merge "Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test."" into mnc-dev

8 years agoMerge "Do not show removed permissions in the UI - framework" into mnc-dev
Svetoslav Ganov [Sat, 8 Aug 2015 06:48:38 +0000 (06:48 +0000)]
Merge "Do not show removed permissions in the UI - framework" into mnc-dev

8 years agoMerge "Fix issue #23037093: "Write system settings" permission value fails..." into...
Dianne Hackborn [Sat, 8 Aug 2015 06:35:03 +0000 (06:35 +0000)]
Merge "Fix issue #23037093: "Write system settings" permission value fails..." into mnc-dev

8 years agoDo not show removed permissions in the UI - framework
Svet Ganov [Sat, 8 Aug 2015 06:06:00 +0000 (23:06 -0700)]
Do not show removed permissions in the UI - framework

bug:23043018

Change-Id: Ia5cf49f299eda627d9fde2b34498812afcb3a6d5

8 years agoFix wifi disable during restore
Christopher Tate [Sat, 8 Aug 2015 02:20:05 +0000 (19:20 -0700)]
Fix wifi disable during restore

The main looper needs to run freely for a moment after disabling
wifi in order for various signals (content observers, broadcast) to
propagate to all the listeners that need to take action for the
wifi stack to shut all the way down.  This patch breaks up the
disable-and-rewrite-config sequence of wifi AP restore in to two
distinct operations separated by a moment so as not to block those
necessary messages.

Bug 22979342

Change-Id: I271766cad0e454669a194652fb67f835bb022cd1

8 years agoFix issue #23037093: "Write system settings" permission value fails...
Dianne Hackborn [Sat, 8 Aug 2015 01:26:38 +0000 (18:26 -0700)]
Fix issue #23037093: "Write system settings" permission value fails...

...to persist after reboot

We were writing a corrupt settings file, so would always reset back
to the default app ops state after boot...!

Also add new appops service commands to manually write and read
its settings, since that is very useful for testing.

Change-Id: Ia510507764738fd82e45ec0be6db840c6ea30c28

8 years agoMerge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
Billy Lau [Fri, 7 Aug 2015 22:16:03 +0000 (22:16 +0000)]
Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev

8 years agoMerge "Fix issue #22989030: Separate battery whitelists" into mnc-dev
Dianne Hackborn [Fri, 7 Aug 2015 21:58:38 +0000 (21:58 +0000)]
Merge "Fix issue #22989030: Separate battery whitelists" into mnc-dev

8 years agoMerge "Correctly skip files that are excluded from restore" into mnc-dev
Matthew Williams [Fri, 7 Aug 2015 21:25:31 +0000 (21:25 +0000)]
Merge "Correctly skip files that are excluded from restore" into mnc-dev

8 years agoFix issue #22989030: Separate battery whitelists
Dianne Hackborn [Fri, 7 Aug 2015 05:19:06 +0000 (22:19 -0700)]
Fix issue #22989030: Separate battery whitelists

We now have a new whitelist you can put apps in, which
opts them out of the old battery saver mode and new app idle,
but doesn't keep them from going in to doze.  This is for a few
special cases that we had previously whitelisted for battery saver,
and inherited to the new modes...  ultimately we should figure out
how to get these apps out of the whitelist completely, but this
will help for now.

Apps in this new whitelist are not shown in the UI, because they
are still significantly restricted by not being able to operate
normally in doze.  This also means they are still visible in the
list of all apps for the user to be able to put them on/off the
complete whitelist if that is what they really want.

In the course of doing this, I needed to clean up code in the
network policy manager to better separate management of the
two firewall rules that now have different whitelists applied
to them.  This also hopefully just generally simplifies and cleans
up that code.  Hopefully!

Change-Id: I92e15f2f85899571dd8b049b5e3eb1354f55f353

8 years agoFiltering Remote-Submix and Back-mic devices from AudioDeviceInfo API.
Paul McLean [Fri, 7 Aug 2015 18:50:48 +0000 (12:50 -0600)]
Filtering Remote-Submix and Back-mic devices from AudioDeviceInfo API.

Bug: 22729461
Change-Id: Ie581c385af2be16e61fcab5993391ef42f82a7d8

8 years agoMerge "Fix check for caller being the active network scorer" into mnc-dev
Shirish Kalele [Fri, 7 Aug 2015 20:25:06 +0000 (20:25 +0000)]
Merge "Fix check for caller being the active network scorer" into mnc-dev

8 years agoMerge "Keep intent verification status of system apps when uninstalling them." into...
Nicolas Prévot [Fri, 7 Aug 2015 19:23:52 +0000 (19:23 +0000)]
Merge "Keep intent verification status of system apps when uninstalling them." into mnc-dev

8 years agoMerge "Update Navigation bar assets." into mnc-dev
Julia Reynolds [Fri, 7 Aug 2015 19:19:02 +0000 (19:19 +0000)]
Merge "Update Navigation bar assets." into mnc-dev

8 years agoRevert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test."
Paul Mclean [Fri, 7 Aug 2015 17:12:47 +0000 (17:12 +0000)]
Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test."

This reverts commit 8b2562b14c37cd61f9c8e1b21e28cf57ff5b7523.

Change-Id: I731d01fd652e928ba331fa28bb09cc8234753fbf

8 years agoMerge "Allow system to disable lockscreen" into mnc-dev
Jason Monk [Fri, 7 Aug 2015 18:40:19 +0000 (18:40 +0000)]
Merge "Allow system to disable lockscreen" into mnc-dev

8 years agoBug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
Billy Lau [Sat, 1 Aug 2015 11:45:02 +0000 (12:45 +0100)]
Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS

Merge the CHANGE_NETWORK_STATE permission with WRITE_SETTINGS.

AndroidManifest.xml:
Raised the protection level of CHANGE_NETWORK_STATE permission from
normal to signature|appops and pre23|preinstall for compatibility

provider/Settings:
Wrote new helper methods to check if app is allowed to change network
state.

ConnectivityManager.java & ConnectivityService.java:
Replace enforcement checks for CHANGE_NETWORK_STATE with
checkAndNoteChangeNetworkStateOperations instead.

Change-Id: If8c2dd3c76a5324ca43f1d90fa17973216c2bcc5

8 years agoMerge "Fix partial user cleanup on restart" into mnc-dev
Amith Yamasani [Fri, 7 Aug 2015 18:21:30 +0000 (18:21 +0000)]
Merge "Fix partial user cleanup on restart" into mnc-dev

8 years agoMerge "Wait a bit longer for wifi to shut down before rewriting the config" into...
Chris Tate [Fri, 7 Aug 2015 18:15:19 +0000 (18:15 +0000)]
Merge "Wait a bit longer for wifi to shut down before rewriting the config" into mnc-dev

8 years agoKeep intent verification status of system apps when uninstalling them.
Nicolas Prevot [Fri, 7 Aug 2015 18:11:25 +0000 (19:11 +0100)]
Keep intent verification status of system apps when uninstalling them.

When creating a work profile, system apps are uninstalled and then
sometimes reinstalled.
In the process, they lose their intent verification status.

BUG:22943461
Change-Id:I5b008c6de2125f190063b08908076a649067c60d

8 years agoFix partial user cleanup on restart
Amith Yamasani [Fri, 7 Aug 2015 18:09:05 +0000 (11:09 -0700)]
Fix partial user cleanup on restart

Internal volume was not available during PackageManagerService creation,
which resulted in a zombie user's folder not being cleaned after a reboot.

Add the internal volume earlier in the boot cycle so that it can be accessed
for user cleanup.

Bug: 22483086
Change-Id: I8f3ffbb25f3902d00a96d1ee2d7a79373c5e35b7

8 years agoMerge "Debugging for issue #22556778: Starting under voice control not allowed" into...
Dianne Hackborn [Fri, 7 Aug 2015 18:06:01 +0000 (18:06 +0000)]
Merge "Debugging for issue #22556778: Starting under voice control not allowed" into mnc-dev

8 years agoUpdate Navigation bar assets.
Julia Reynolds [Fri, 7 Aug 2015 17:56:08 +0000 (13:56 -0400)]
Update Navigation bar assets.

Bug: 22855920
Change-Id: I2d66bb087b092cdb6280e78c064f32ae9e42ad61

8 years agoWait a bit longer for wifi to shut down before rewriting the config
Christopher Tate [Fri, 7 Aug 2015 17:57:01 +0000 (10:57 -0700)]
Wait a bit longer for wifi to shut down before rewriting the config

We've seen case of it taking longer than 1500ms for the wifi system to
actually shut down after the triggering settings element is written,
so extend the wait time a bit.  We've seen it take more than 1500ms
but not more than 2500ms, so that's the new heuristic.

This will of course all become happily obsolete once we start
applying restored AP definitions programmatically rather than by
filesystem-level operations.

Bug 22979342

Change-Id: I6acf1baac23d4100124093128b82abf242b11a0e

8 years agoDebugging for issue #22556778: Starting under voice control not allowed
Dianne Hackborn [Fri, 7 Aug 2015 17:37:21 +0000 (10:37 -0700)]
Debugging for issue #22556778: Starting under voice control not allowed

Better error messages in log to explain what is going on.

Change-Id: Ie686a323ceedd42453b6581fe79653b407d49ee5

8 years agoMerge "Fix issue #22846750: Starting Screenie Now On Tap crashes USA Today" into...
Dianne Hackborn [Fri, 7 Aug 2015 17:18:11 +0000 (17:18 +0000)]
Merge "Fix issue #22846750: Starting Screenie Now On Tap crashes USA Today" into mnc-dev

8 years agoMerge "DO NOT MERGE. Add new media navigation keys." into mnc-dev
Michael Wright [Fri, 7 Aug 2015 16:52:27 +0000 (16:52 +0000)]
Merge "DO NOT MERGE. Add new media navigation keys." into mnc-dev

8 years agoMerge "Immediately kill a shared user process on a permission revocation." into mnc-dev
Svetoslav Ganov [Fri, 7 Aug 2015 15:27:49 +0000 (15:27 +0000)]
Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev

8 years agoMerge "Use BluetoothController for status bar icon status" into mnc-dev
Jason Monk [Fri, 7 Aug 2015 14:38:29 +0000 (14:38 +0000)]
Merge "Use BluetoothController for status bar icon status" into mnc-dev

8 years agoDO NOT MERGE. Add new media navigation keys.
Michael Wright [Thu, 6 Aug 2015 14:16:22 +0000 (15:16 +0100)]
DO NOT MERGE. Add new media navigation keys.

Bug: 22059484
Change-Id: Ifd8fd18178fed45ead2980b957dd1d177e40f165

8 years agoAllow system to disable lockscreen
Jason Monk [Thu, 6 Aug 2015 18:49:36 +0000 (14:49 -0400)]
Allow system to disable lockscreen

Even when there is a pin.

Bug: 22920549
Change-Id: Ib84e1c3ac67be0318d4186c66ee582a49969e373

8 years agoFix issue #22846750: Starting Screenie Now On Tap crashes USA Today
Dianne Hackborn [Thu, 6 Aug 2015 01:07:31 +0000 (18:07 -0700)]
Fix issue #22846750: Starting Screenie Now On Tap crashes USA Today

Try to deal well with badly behaving old apps.

Change-Id: Ibc41e5867869463fbf91f3e411c69677909fedad

8 years agoImmediately kill a shared user process on a permission revocation.
Svetoslav [Thu, 6 Aug 2015 22:03:55 +0000 (15:03 -0700)]
Immediately kill a shared user process on a permission revocation.

1. When a permission is revoked we kill the app immediately but do
   not do an immediate kill for shared uid processes. This fixes it.

2. Remove system APIs that are used only by the package installer.

bug:22984670

Change-Id: I3d4ae52ea8679f894aa7c5972941263903479183

8 years agoMerge "Correctly propagate permissions when uninstalling updates." into mnc-dev
Jeff Davidson [Fri, 7 Aug 2015 01:39:14 +0000 (01:39 +0000)]
Merge "Correctly propagate permissions when uninstalling updates." into mnc-dev

8 years agoLook for recent tasks in live stacks.
Wale Ogunwale [Fri, 7 Aug 2015 00:16:02 +0000 (17:16 -0700)]
Look for recent tasks in live stacks.

It is possible for a tasks not to have been saved to the
persisted recent list yet for various reasons. This causes
some external calls to fail when they are trying to do
an operation on a task with a given id. We now use the
stack supervisor look-up for a task id that checks
everywhere a task might be including live stack. It this
fails then the task truly doesn't exist.

Bug: 22924782
Change-Id: I57c3df41d0b4f3ee3c5ae9b7d01eeb2b352062b4

8 years agoMerge "LayoutLib: Switch SimpleDateFormat to icu." into mnc-dev
Deepanshu Gupta [Thu, 6 Aug 2015 23:26:01 +0000 (23:26 +0000)]
Merge "LayoutLib: Switch SimpleDateFormat to icu." into mnc-dev

8 years agoMerge "Replace Locale.getDefault with custom impl." into mnc-dev
Deepanshu Gupta [Thu, 6 Aug 2015 23:08:46 +0000 (23:08 +0000)]
Merge "Replace Locale.getDefault with custom impl." into mnc-dev

8 years agoLayoutLib: Switch SimpleDateFormat to icu.
Deepanshu Gupta [Thu, 6 Aug 2015 22:32:44 +0000 (15:32 -0700)]
LayoutLib: Switch SimpleDateFormat to icu.

Use ICU's implementation of SimpleDateFormat in LayoutLib. The format
patterns used are not supported by java.text.SimpleDateFormat.

The change required adding a mechanism for promoting visibility of
fields in the framework in the create tool.
TODO: Add additional tests in the create tool for this new
functionality.

Change-Id: Id0f4be41f9731c42a28919c32cc5ef271a656982

8 years agoReplace Locale.getDefault with custom impl.
Deepanshu Gupta [Tue, 4 Aug 2015 23:17:46 +0000 (16:17 -0700)]
Replace Locale.getDefault with custom impl.

In LayoutLib the default locale should always be the locale set the
rendering params. This change replaces all calls to Locale.getDefault in
the framework with calls to AndroidLocale.getDefault() which tries to
find the locale from the current context, but falls back to the original
call.

Change-Id: I496b35dcfc17fd61fedee21c7495541ab870b1fc

8 years agoMerge "[UserManager] expose method to retrieve credential owner" into mnc-dev
Andres Morales [Thu, 6 Aug 2015 22:22:17 +0000 (22:22 +0000)]
Merge "[UserManager] expose method to retrieve credential owner" into mnc-dev

8 years agoMerge "Fixing issue with empty Recents screen." into mnc-dev
Winson Chung [Thu, 6 Aug 2015 21:44:17 +0000 (21:44 +0000)]
Merge "Fixing issue with empty Recents screen." into mnc-dev

8 years agoMerge "MediaSync: fix API comments." into mnc-dev
Wei Jia [Thu, 6 Aug 2015 21:31:22 +0000 (21:31 +0000)]
Merge "MediaSync: fix API comments." into mnc-dev

8 years agoUse BluetoothController for status bar icon status
Jason Monk [Thu, 6 Aug 2015 20:32:18 +0000 (16:32 -0400)]
Use BluetoothController for status bar icon status

Bug: 22819904
Change-Id: I6ca11c57431f8e930a47144090158363175a3b99

8 years agoFix check for caller being the active network scorer
Shirish Kalele [Thu, 6 Aug 2015 19:34:22 +0000 (12:34 -0700)]
Fix check for caller being the active network scorer

Compare caller and scorer uids to decide if caller is the
active scorer instead of calling AppOps.checkPackage().

Bug: 23000690
Change-Id: I64285f965716f3aceb24f193d86ab9d6be7202c5

8 years agoMediaSync: fix API comments.
Wei Jia [Thu, 6 Aug 2015 18:04:22 +0000 (11:04 -0700)]
MediaSync: fix API comments.

Bug: 23008551

Change-Id: Ifbf1970c174b54a761d4672d954ee5633adbf3d6

8 years agoFixing issue with empty Recents screen.
Winson [Thu, 6 Aug 2015 19:51:26 +0000 (12:51 -0700)]
Fixing issue with empty Recents screen.

- We did not expect RecentsActivity to be launched without going through
  the normal SystemUI controls, but when the home activity is in the foreground
  and killed (via a normal apk update), the RecentsActivity stores the old
  launch configuration and believes that it was launched from home and awaits
  the animation-complete callback to animate the tasks in.
- This CL adds a workaround where the configuration is reset whenever
  RecentsActivity is stopped, which allows the tasks to be shown immediately
  if the User is kicked back into Recents due to an update.

Bug: 22542869
Change-Id: I2b4168ccecfbf868fa6d544fe89109dfa74f51df

8 years agoMerge "Protect runtime storage mount points." into mnc-dev
Jeff Sharkey [Thu, 6 Aug 2015 19:27:42 +0000 (19:27 +0000)]
Merge "Protect runtime storage mount points." into mnc-dev

8 years agoMerge "add metrics to assistant" into mnc-dev
Chris Wren [Thu, 6 Aug 2015 19:18:17 +0000 (19:18 +0000)]
Merge "add metrics to assistant" into mnc-dev

8 years agoMerge "Use realActivity as indicator for task locking" into mnc-dev
Benjamin Franz [Thu, 6 Aug 2015 19:15:29 +0000 (19:15 +0000)]
Merge "Use realActivity as indicator for task locking" into mnc-dev

8 years agoadd metrics to assistant
Chris Wren [Thu, 6 Aug 2015 18:53:32 +0000 (14:53 -0400)]
add metrics to assistant

  long press
  screenshot enabled
  context enabled

Bug: 22949579
Change-Id: Iac178207fa7149cda03c9a817a0d1450e46e1c59

8 years agoMerge "Pregrant unrevokable storage permission to the CertInstaller" into mnc-dev
Svetoslav Ganov [Thu, 6 Aug 2015 19:08:33 +0000 (19:08 +0000)]
Merge "Pregrant unrevokable storage permission to the CertInstaller" into mnc-dev

8 years agoMerge "Consider channel index masks when calculating channel counts." into mnc-dev
Paul Mclean [Thu, 6 Aug 2015 18:59:06 +0000 (18:59 +0000)]
Merge "Consider channel index masks when calculating channel counts." into mnc-dev

8 years agoMerge "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test." into...
Paul Mclean [Thu, 6 Aug 2015 18:58:33 +0000 (18:58 +0000)]
Merge "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test." into mnc-dev

8 years agoProtect runtime storage mount points.
Jeff Sharkey [Thu, 6 Aug 2015 18:40:21 +0000 (11:40 -0700)]
Protect runtime storage mount points.

We have a bunch of magic that mounts the correct view of storage
access based on the runtime permissions of an app, but we forgot to
protect the real underlying data sources; oops.

This series of changes just bumps the directory heirarchy one level
to give us /mnt/runtime which we can mask off as 0700 to prevent
people from jumping to the exposed internals.

Also add CTS tests to verify that we're protecting access to
internal mount points like this.

Bug: 22964288
Change-Id: I74dbdcb01d4fabe92166b8043a74c6a1e93c6d5f

8 years agoMerge "Update anchor background on the correct view in PopupWindow" into mnc-dev
Alan Viverette [Thu, 6 Aug 2015 17:48:22 +0000 (17:48 +0000)]
Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev

8 years agoCorrectly skip files that are excluded from restore
Matthew Williams [Thu, 6 Aug 2015 01:27:44 +0000 (18:27 -0700)]
Correctly skip files that are excluded from restore

BUG: 22957980
If a file was present in the backup but excluded on restore,
it can result in the restored data being corrupted.
Ensure that FullBackup.restoreFile is called with a
null destination, which will result in the file not
being written to disk, but still properly pulled
from the socket.

Change-Id: Iac882a961b76e687654535aec352678486a08c39

8 years agoUse realActivity as indicator for task locking
Benjamin Franz [Thu, 6 Aug 2015 17:09:03 +0000 (18:09 +0100)]
Use realActivity as indicator for task locking

When lock task mode is started, we verify that the package is
whitelisted and currently use mCallingPackage as indicator. However,
the calling package is not necessarily identical to the package trying
to lock itself, so lock task mode sometimes fails. Switching over to
using realActivity as package marker.

Bug: 22916291
Change-Id: Ifd4df2d634842c8106b0b0f690bcf1faba0ed5fa

8 years agoMerge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResul...
Dianne Hackborn [Thu, 6 Aug 2015 16:48:34 +0000 (16:48 +0000)]
Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev

8 years agoUpdate anchor background on the correct view in PopupWindow
Alan Viverette [Thu, 6 Aug 2015 16:36:47 +0000 (12:36 -0400)]
Update anchor background on the correct view in PopupWindow

We were always setting the background of the decor view when the
"above anchor" state changed, rather than the background view.

Bug: 22970244
Change-Id: I3cd7202767ee47cb415736bb3c07369801abccd8

8 years agoMerge "Avoid changing internal state of shared drawable" into mnc-dev
Chet Haase [Thu, 6 Aug 2015 16:23:20 +0000 (16:23 +0000)]
Merge "Avoid changing internal state of shared drawable" into mnc-dev

8 years agoAdd a (hidden) mapping for REMOTE_SUBMIX device types for CTS test.
Paul McLean [Thu, 6 Aug 2015 15:35:55 +0000 (09:35 -0600)]
Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test.

Bug: 22792346
Change-Id: I8a10eb68368ede4baa0d2fd0d71cfff2fced4b75

8 years agoMerge "Update documentation of DevicePolicyManager intents." into mnc-dev
Alan Treadway [Thu, 6 Aug 2015 15:47:34 +0000 (15:47 +0000)]
Merge "Update documentation of DevicePolicyManager intents." into mnc-dev

8 years agoUpdate documentation of DevicePolicyManager intents.
Alan Treadway [Tue, 28 Jul 2015 10:49:35 +0000 (11:49 +0100)]
Update documentation of DevicePolicyManager intents.

Add additional information about the intentions of result codes in
device-owner and profile-owner launch intents, in alignment with
changes made in http://ag/732321.

Bug: 21063241
Change-Id: I0e0a931739cee5f46e8fc7622fe1de49e26dcb0a

8 years agoAvoid changing internal state of shared drawable
Chet Haase [Thu, 6 Aug 2015 04:44:42 +0000 (21:44 -0700)]
Avoid changing internal state of shared drawable

An optimization in ImageView nulled out the internal bitmap of a cached
internal BitmapDrawable object created to wrap a bitmap set on the ImageView.
However, apps can get ahold of that cached object via Drawable.getBitmap(),
resulting in having the state of that object they may be using changing out
from under them.

The change is to null out the cached object when getDrawable() is called, to avoid
leaking internal state that we may change.
That way, the app can continue to use that object if they want to, but we are no longer
relying on it internally, and will create a new one when needed.

Issue #22930646  [1P Regression from L] ImageView is blanked out in Activity in Google Express

Change-Id: Ic86cb93be4897b6ba247c1fabcda507e4ba01300

8 years agoMerge "Make the NullVibrator really null." into mnc-dev
Michael Wright [Thu, 6 Aug 2015 13:52:34 +0000 (13:52 +0000)]
Merge "Make the NullVibrator really null." into mnc-dev

8 years agoMerge "Don't dispatch when non-interactive and the display is off." into mnc-dev
Michael Wright [Thu, 6 Aug 2015 13:50:37 +0000 (13:50 +0000)]
Merge "Don't dispatch when non-interactive and the display is off." into mnc-dev

8 years agoMerge "Store ringer mode on entering DND mode so it can be restored on exit." into...
Julia Reynolds [Thu, 6 Aug 2015 13:41:01 +0000 (13:41 +0000)]
Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Thu, 6 Aug 2015 04:12:38 +0000 (04:12 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

8 years agoDon't show fingerprint cancellation messages in keyguard
Jim Miller [Thu, 6 Aug 2015 02:03:01 +0000 (19:03 -0700)]
Don't show fingerprint cancellation messages in keyguard

Cancellation messages can come from a variety of sources
and are not user-actionable.  As a result, we just shouldn't
show them.

Fixes bug 22863862

Change-Id: I2154c774fd5ac7477e01d1cbf3bdde2d1929363b

8 years agoMerge "Pass connection configuration when setting wifi info" into mnc-dev
Mitchell Wills [Thu, 6 Aug 2015 02:23:44 +0000 (02:23 +0000)]
Merge "Pass connection configuration when setting wifi info" into mnc-dev

8 years agoPregrant unrevokable storage permission to the CertInstaller
Svetoslav [Thu, 6 Aug 2015 02:14:47 +0000 (19:14 -0700)]
Pregrant unrevokable storage permission to the CertInstaller

bug:22988119

Change-Id: I310aa7149f67a7918cecfda13c69ab91c7c6e1a8

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 00:54:19 +0000 (17:54 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 22842106
Change-Id: I473bc0dc200e1eec3bd0f907526fcf808ee86e36

8 years agoMerge "Removing tethering overlay for mcc202-mnc05 (VF Greece)." into mnc-dev
Amit Mahajan [Wed, 5 Aug 2015 23:09:58 +0000 (23:09 +0000)]
Merge "Removing tethering overlay for mcc202-mnc05 (VF Greece)." into mnc-dev

8 years agoMerge "Disable fingerprint when remotely reset by DPM" into mnc-dev
Jim Miller [Wed, 5 Aug 2015 22:47:57 +0000 (22:47 +0000)]
Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev

8 years agoPass connection configuration when setting wifi info
Mitchell Wills [Mon, 3 Aug 2015 16:46:08 +0000 (09:46 -0700)]
Pass connection configuration when setting wifi info

This allows the both the ssid and connection info to be verified when
updating wifi info.

Bug: 22797622
Change-Id: I82d771a299e17469683516c6b1077cb260981812

8 years agoMerge "Correctly hide setConnectionService" into mnc-dev
Yorke Lee [Wed, 5 Aug 2015 22:13:07 +0000 (22:13 +0000)]
Merge "Correctly hide setConnectionService" into mnc-dev

8 years agoFix issue #22843150: fragment transaction crash from onRequestPermisssionResult
Dianne Hackborn [Wed, 5 Aug 2015 22:01:28 +0000 (15:01 -0700)]
Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult

Add new Activity callback to tell it when its saved state has
been invalidated.

The problem is that delivering the permission result does not go
through a path where the compatibility code can see it first to
mark its fragment manager as no longer having saved state.  So this
new callback gives it a place to do that.

Change-Id: I5a4a185d9c746bae1afb5c588aba82c8daccf079

8 years agoCorrectly propagate permissions when uninstalling updates.
Jeff Davidson [Wed, 5 Aug 2015 21:33:17 +0000 (14:33 -0700)]
Correctly propagate permissions when uninstalling updates.

In ag/733689, which was intended to fix this bug, the following lines
were removed:

// Propagate the permissions state as we do want to drop on the floor
// runtime permissions. The update permissions method below will take
// care of removing obsolete permissions and grant install permissions.
ps.getPermissionsState().copyFrom(disabledPs.getPermissionsState());

The intent with these lines seemed to be that we needed to copy
permissions from the application on /data, which is being uninstalled,
over to the copy on /system, which was disabled but is being
reenabled. However, it wasn't functional, because it incorrectly
copied from the copy on /system, not the copy on /data.

Restore this code, copying from newPs (the copy on /data) rather than
disbledPs (the copy on /system), and clarify the comment because we do
*not* want to drop runtime permissions on the floor.

Bug: 22665508
Change-Id: I6bae37e70b6df1043c9a2b49255b985707ba151a

8 years agoMerge changes I85106f37,I7db398aa into mnc-dev
Deepanshu Gupta [Wed, 5 Aug 2015 21:11:40 +0000 (21:11 +0000)]
Merge changes I85106f37,I7db398aa into mnc-dev

* changes:
  Make getInt in BridgeTypedArray accept empty String.
  Fix layout mirroring.

8 years agoMerge "Documenting behavior of returning a 0-length array for formats, channels,...
Paul Mclean [Wed, 5 Aug 2015 20:50:29 +0000 (20:50 +0000)]
Merge "Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices." into mnc-dev

8 years agoDisable fingerprint when remotely reset by DPM
Jim Miller [Wed, 5 Aug 2015 20:03:21 +0000 (13:03 -0700)]
Disable fingerprint when remotely reset by DPM

When the device is lost or stolen, it's safer to
fall back to strong authentication (pin, pattern or
password).  This disables fingerprint like we do with
trust agents.

Fixes bug 21620081

Change-Id: I7bbe54be3721b2f160b783daeb3acbe434705046

8 years agoDocumenting behavior of returning a 0-length array for formats,
Paul McLean [Fri, 31 Jul 2015 15:28:22 +0000 (09:28 -0600)]
Documenting behavior of returning a 0-length array for formats,
channels, rates queries for analog devices.

Bug: 22729461
Change-Id: I3cb1d586f6264e3627cbb0261a3b2c74ca51cf6b

8 years agoMerge "MidiManager: use ConcurrentHashMap" into mnc-dev
Phil Burk [Wed, 5 Aug 2015 19:43:21 +0000 (19:43 +0000)]
Merge "MidiManager: use ConcurrentHashMap" into mnc-dev

8 years agoMerge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev
Vladislav Kaznacheev [Wed, 5 Aug 2015 19:34:38 +0000 (19:34 +0000)]
Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev

8 years agoRemoving tethering overlay for mcc202-mnc05 (VF Greece).
Amit Mahajan [Wed, 5 Aug 2015 18:11:56 +0000 (11:11 -0700)]
Removing tethering overlay for mcc202-mnc05 (VF Greece).

Bug: 22942869
Change-Id: I1d80ab3a66f7e1cd8e497b0d4236f80b0a126228