199049 Commits

Author SHA1 Message Date
Diego Perez
af8c19e770 am 7d85b543: Merge "Make DelegateManager thread safe" into mnc-dev
* commit '7d85b5435d01f8d4856a718d655e30fb5a703560':
  Make DelegateManager thread safe
2015-08-11 20:49:51 +00: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
bb03bf0554 am 105febd2: Merge "Don\'t re-wrap alert dialog context" into mnc-dev
* commit '105febd2cfb4760926ed0aef3c24be3727dd36e4':
  Don't re-wrap alert dialog context
2015-08-11 19:41:40 +00:00
Alan Viverette
bfd62580df am 11104791: Merge "Ensure ripple mask is drawn at correct position" into mnc-dev
* commit '11104791c71e0140f1d37b711ca929939a85b77c':
  Ensure ripple mask is drawn at correct position
2015-08-11 19:41:35 +00: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
e720297fd8 am b4eb0640: Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev
* commit 'b4eb06402fba62f94bb16cbe433fe99a8df7cb18':
  Avoid use-after-free race condition when rebasing theme
2015-08-11 18:31:48 +00: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
Jason Monk
540542b417 Fix tuner for secondary users
Bug: 23112000
Change-Id: I52aabdd1f345fb50e2c5015d233f4de3cc8d994d
2015-08-11 14:21:52 -04: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
5bba07eb01 am ad7719de: Merge "Crash apps with bad notification icons." into mnc-dev
* commit 'ad7719dea4e8fd34854e4dcc918fc593c4416d82':
  Crash apps with bad notification icons.
2015-08-11 14:22:12 +00:00
Daniel Sandler
ad7719dea4 Merge "Crash apps with bad notification icons." into mnc-dev 2015-08-11 14:17:45 +00:00
Jason Monk
3605247746 Merge "Add setting to disable camera gesture" into mnc-dr-dev 2015-08-11 13:55:53 +00:00
Esteban Talavera
467951eebb am 4dbb37ae: Merge "Update setApplicationRestrictions documentation" into mnc-dev
* commit '4dbb37ae95bdf60d230777c6a5e8d53b932e9d40':
  Update setApplicationRestrictions documentation
2015-08-11 10:08:51 +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
d06696939b am b08c24a3: Frameworks/base: Disable Clang in core/jni
* commit 'b08c24a3e4f5362bbddc3735802e844e1992cd46':
  Frameworks/base: Disable Clang in core/jni
2015-08-11 06:35:42 +00: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 2bc67a1b5f9d4662ef7da4645ca8e580302b3553)
2015-08-11 06:18:49 +00:00
Winson Chung
bc58c9453f am c00b1067: Merge "Pushing the startActivity before the calls to remove task." into mnc-dev
* commit 'c00b1067a05116548a0883e1400a1c4715078797':
  Pushing the startActivity before the calls to remove task.
2015-08-11 02:40:05 +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
3767d85caa am f8359cfb: Merge "Don\'t show fingerprint cancellation messages in keyguard" into mnc-dev
* commit 'f8359cfb93e349771388709b160ae1b9d3f880b3':
  Don't show fingerprint cancellation messages in keyguard
2015-08-11 01:39:43 +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
5cf89a0119 am b2b02092: Merge "Fix issue #23037899: Support for Battery Optimization permission + Dialog" into mnc-dev
* commit 'b2b020922fb51b88d34a6478209fc232702de318':
  Fix issue #23037899: Support for Battery Optimization permission + Dialog
2015-08-11 00:19:44 +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
2c8c251e73 am 77d5b914: Merge "DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED" into mnc-dev
* commit '77d5b91401d87610128d9bf656f66c0d74bcb254':
  DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED
2015-08-10 22:45:10 +00:00
Chris Tate
5ca842ae08 am 5d05a24c: Merge "Fix wifi disable during restore" into mnc-dev
* commit '5d05a24cff5be83dc7b03deccfb7f52b0066b34e':
  Fix wifi disable during restore
2015-08-10 22:40:25 +00: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
862840d689 am 301dfe08: Merge "[Fix getAccounts MANAGE_USERS permission]" into mnc-dev
* commit '301dfe08bc662e9475739309a0ccbce2231ecddb':
  [Fix getAccounts MANAGE_USERS permission]
2015-08-10 21:44:04 +00: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
Geoff Mendal
3ea5cfa8e8 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-08-10 18:09:23 +00:00
Geoff Mendal
c21a0fa940 Import translations. DO NOT MERGE
Change-Id: Ie2a8186b906ad14696892948248a0f7e47a4a744
Auto-generated-cl: translation import
2015-08-10 11:00:18 -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)
c207c9437d am c5283927: Close ZipFiles correctly in WebViewFactory.
* commit 'c52839277b8714d150a9fe276b6ba3fa8a0cbf38':
  Close ZipFiles correctly in WebViewFactory.
2015-08-10 16:01:43 +00: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
a5c0c209c5 am 4218e46a: Merge "Initialize network name better in NetworkController" into mnc-dev
* commit '4218e46a3263e5ed9d99e600ef9b30cbd24cc861':
  Initialize network name better in NetworkController
2015-08-10 14:56:52 +00:00
Jason Monk
4218e46a32 Merge "Initialize network name better in NetworkController" into mnc-dev 2015-08-10 14:50:45 +00:00
Jason Monk
00aa9d4427 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
2015-08-10 10:29:47 -04:00