Commit Graph

198101 Commits

Author SHA1 Message Date
Mike Dodd
7f2f96cce3 Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev 2015-08-12 17:01:25 +00:00
Todd Kennedy
24e4d48f56 Merge "Promote system app permissions" into mnc-dev 2015-08-12 16:51:13 +00:00
Michael Wright
e20493ea5a Merge "Log last filtered sensor timestamp." into mnc-dev 2015-08-12 16:32:11 +00:00
Michael Wright
6eabf57e58 Log last filtered sensor timestamp.
Bug: 22870354
Change-Id: Ib4efaa0f05bec81856c939c5c640eceff98d88ed
2015-08-12 16:53:24 +01:00
Todd Kennedy
8b3e6b0df1 Promote system app permissions
When upgrading from a pre-M version of Android, install permissions for
exisiting system are promoted to runtime permissions. This only happens
for apps that existed prior to the OTA. Other system apps targeting M
are not automatically granted any permissions.

Bug: 22970710
Change-Id: I964ee3f93c66ea43fbb1be6b5ac6b09ddea3c385
2015-08-12 08:26:15 -07:00
Narayan Kamath
bf88205bef Fall back to persist.sys.language/country if locale isn't set.
This will prevent users from losing their language setting when they
take an OTA to M.

bug: 23021286
Change-Id: Ifb66f6bf6a940ab745edac709321f3009ec6eab4
2015-08-12 11:03:46 +01:00
Alex Klyubin
e19b76cbb5 Merge "Add more examples of generating/importing keys to Javadocs." into mnc-dev 2015-08-12 05:42:29 +00:00
Lorenzo Colitti
e022cb085f Merge "Don't attempt to stop the receive thread if we never started it." into mnc-dev 2015-08-12 03:38:57 +00:00
Carlos Valdivia
968fc3ab75 Merge "Fix deadlock." into mnc-dev 2015-08-12 01:42:19 +00:00
Julia Reynolds
77b0d6e9f0 Merge "New landscape Navigation bar icons." into mnc-dev 2015-08-12 01:19:01 +00:00
Filip Gruszczynski
59123b9b2d Merge "When closing task stack remove reference to display content." into mnc-dev 2015-08-12 00:40:50 +00:00
Dianne Hackborn
15f704e70a Merge "Fix issue #23122445: Add 420 density" into mnc-dev 2015-08-12 00:34:56 +00:00
Wale Ogunwale
e43d43c391 Merge "Fixed issue with moveTaskToBack on single stack devices" into mnc-dev 2015-08-12 00:31:26 +00:00
Dianne Hackborn
1e9c51a00a Fix issue #23122445: Add 420 density
Change-Id: I15c113eb7e22f1d882db071c007224746f9d408f
2015-08-11 17:18:53 -07:00
Andres Morales
494d6e9b03 [fingerprint] use credential owner in FingerprintService
Bug: 23027554
Change-Id: I185492b5008058fdb23a4536a8a73177ee4903d8
2015-08-11 23:14:34 +00:00
Winson Chung
8851608de3 Merge "Always call onProvidersChanged() when packages containing widgets are updated." into mnc-dev 2015-08-11 22:53:51 +00:00
Chris Manton
19aa341a35 Merge "Save data registration roaming state" into mnc-dev 2015-08-11 22:19:39 +00:00
Carlos Valdivia
a3721e1cc8 Fix deadlock.
AccountManagerService can't ever synchronize on mUsers within a block of
code locked by UserAccounts.cacheLock. That will lead to deadlocks.

This change fixes a case where we were doing that in
getAccountsInternal(). Also I have purgeOldGrantsAll() run off the the
main thread.

Bug: 23036400
Change-Id: I8634691ca54c57a6e83633baba549226fdcd1064
2015-08-11 15:12:22 -07:00
Winson
dbba74e81f Always call onProvidersChanged() when packages containing widgets are updated.
- In the existing logic, the call to onProvidersChanged() is called when a package
  with widgets is added or removed, but only called when a package is updated _and_
  there is an app widget bound to a host.  This differs from what the expected
  behavior is based on the documentation and means that packages with widgets that
  update have no way of notifying host apps of changes except via package events.

Bug: 20698931
Change-Id: I60af36d51e99ca1ea751d9d9d03a50ef2d5bef98
2015-08-11 14:29:13 -07:00
Wale Ogunwale
4270924801 Fixed issue with moveTaskToBack on single stack devices
Icdad980eec64e081d15679600da07cf4431e40d6 allowed us to
properly return to the home acitvity when a task is moved
to back. However, this improperly moved the home task to
the front if it is the task we are moving to the back on
a single stack device. We now prevent the movement of the
home task to the front from happening.

Bug: 23088310
Change-Id: Ic21779cdb2d2007671d212d41fab5e68be2ae632
2015-08-11 13:54:42 -07:00
Diego Perez
7d85b5435d Merge "Make DelegateManager thread safe" into mnc-dev 2015-08-11 20:44:40 +00:00
Mike Dodd
3a24898f55 Set default SMS/MMS app to com.android.messaging (new AOSP app).
b/23110861

Change-Id: I5ac753264222cb617027cf13527178a7e754a80b
2015-08-11 13:14:53 -07:00
Alan Viverette
105febd2cf Merge "Don't re-wrap alert dialog context" into mnc-dev 2015-08-11 19:34:27 +00:00
Alan Viverette
11104791c7 Merge "Ensure ripple mask is drawn at correct position" into mnc-dev 2015-08-11 19:33:55 +00:00
Julia Reynolds
fe114b9902 New landscape Navigation bar icons.
Bug: 22855920
Change-Id: I5127c8d0121aa90a1e52da1b51a86bac1c1b2fa1
2015-08-11 15:32:29 -04:00
Alan Viverette
93d9e26ffb Don't re-wrap alert dialog context
Bug: 23038618
Change-Id: Iafe3a45096153d9fe656ad930cc3978d8fab1968
2015-08-11 15:02:42 -04:00
Alex Klyubin
72245d7909 Add more examples of generating/importing keys to Javadocs.
Based on developer feedback, this updates Android Keystore Javadocs
with more examples of generating and importing keys of various
algorithms. This also clarifies that key use authorizations apply to
secret and private key and do no apply to public keys.

Bug: 23102874
Change-Id: If0dc20fda4836fd23b9cd9c92490a04e71b19fc0
2015-08-11 11:36:09 -07:00
Alan Viverette
bac9769146 Ensure ripple mask is drawn at correct position
Bug: 22911708
Change-Id: Icdbe1f8a66d5e35eb25aa973c94f5870896cc1f8
2015-08-11 14:25:45 -04:00
Alan Viverette
b4eb06402f Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev 2015-08-11 18:24:04 +00:00
Chris Manton
1428f43fa7 Save data registration roaming state
Carrier configuration may override the roaming state
but the roaming state may be required for specifying
proper APNs upon data call setup.  This change stores
the unmodified roaming state.

bug: 22990977
Change-Id: I5ebe04f60709bc691e9c79be193f1790a7148818
2015-08-11 16:28:11 +00:00
Alan Viverette
c12ec70def Avoid use-after-free race condition when rebasing theme
... by never rebasing the theme. We don't need to do this unless the
system theme is configuration-dependent, which it is not currently.

Bug: 22943781
Change-Id: I96e695441543379e4d5fdf3cc6f18d9e6cf953b4
2015-08-11 10:26:08 -04:00
Daniel Sandler
ad7719dea4 Merge "Crash apps with bad notification icons." into mnc-dev 2015-08-11 14:17:45 +00:00
Esteban Talavera
4dbb37ae95 Merge "Update setApplicationRestrictions documentation" into mnc-dev 2015-08-11 09:40:57 +00:00
Lorenzo Colitti
31e19f34f5 Don't attempt to stop the receive thread if we never started it.
If socket initialization fails, DhcpState#exit will call
mReceiveThread#stop and crash the system with an NPE. Make sure
we don't do that if mReceiveThread is null, and properly null it
out when exiting.

Bug: 23088314
Change-Id: I4378d8280f9d8588f5eaa8bd7ade61beab1c3ce2
2015-08-11 15:42:59 +09:00
Andreas Gampe
b08c24a3e4 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 2bc67a1b5f)
2015-08-11 06:18:49 +00:00
Winson Chung
c00b1067a0 Merge "Pushing the startActivity before the calls to remove task." into mnc-dev 2015-08-11 02:33:15 +00:00
Jorim Jaggi
f8359cfb93 Merge "Don't show fingerprint cancellation messages in keyguard" into mnc-dev 2015-08-11 01:31:56 +00:00
Dianne Hackborn
b2b020922f Merge "Fix issue #23037899: Support for Battery Optimization permission + Dialog" into mnc-dev 2015-08-11 00:11:20 +00:00
Winson
1df9c3c6bd 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
2015-08-10 15:45:35 -07:00
Matthew Williams
77d5b91401 Merge "DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED" into mnc-dev 2015-08-10 22:36:49 +00:00
Chris Tate
5d05a24cff Merge "Fix wifi disable during restore" into mnc-dev 2015-08-10 22:33:05 +00:00
Kevin Zhu
e910be0b7e 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
2015-08-10 15:03:34 -07:00
Dianne Hackborn
c7b57b1e65 Fix issue #23037899: Support for Battery Optimization permission + Dialog
New permission, new Intent action.

Change-Id: I1d9ba55be8f72074e29d33ad7a0a12a820bbac39
2015-08-10 14:52:52 -07:00
Simranjit Kohli
301dfe08bc Merge "[Fix getAccounts MANAGE_USERS permission]" into mnc-dev 2015-08-10 21:36:30 +00:00
Dan Sandler
334398105f Crash apps with bad notification icons.
This shouldn't happen, since there are many places where
invalid icons should already have been either fixed (in the
case where there's an .icon but no .mSmallIcon) or rejected
(if they're both null or invalid). But if a notification
makes it all the way to SystemUI without a valid icon, let's
crash the sender.

Bug: 23011305
Change-Id: Ifaebec57d59baa1defb4520178b5815d47ed5712
2015-08-10 16:04:12 -04:00
Filip Gruszczynski
26ed265cee When closing task stack remove reference to display content.
This tightens the guarantee that detached stack won't be used. We also
add logging to detecting a situation where a stack not belonging to a
display is being moved on that display.

Bug: 22191609
Change-Id: Ia674bb5960018104a56c5138775ab5216906675b
2015-08-10 13:03:46 -07:00
Simranjit Singh Kohli
b77d8b6085 [Fix getAccounts MANAGE_USERS permission]
Make code having potential to call userInfo inside clearIdentity.
Bug: 22917218

Change-Id: If95fb7c0ec36a2f5c737f04bc7d8af95b44fea22
2015-08-10 12:48:09 -07:00
Esteban Talavera
6b8e06495b Update setApplicationRestrictions documentation
From M we support nested Bundles in the input parameter

Bug: 23076454
Change-Id: I9c27d19ccfbc713ca757cbdde7ea9fbbc3839302
2015-08-10 18:04:10 +01:00
Torne (Richard Coles)
c52839277b 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
2015-08-10 16:40:50 +01:00
Jason Monk
4218e46a32 Merge "Initialize network name better in NetworkController" into mnc-dev 2015-08-10 14:50:45 +00:00