4473 Commits

Author SHA1 Message Date
Kenny Root
f22d550195 am 1247c0a1: am a276589b: am 37edbbc6: Merge "VpnDialogs: filter obscured touches"
# Via Android Git Automerger (2) and others
* commit '1247c0a11d54478158dafcaeedd7e49a6b99fb1f':
  VpnDialogs: filter obscured touches
2013-02-13 17:13:35 -08:00
Kenny Root
1247c0a11d am a276589b: am 37edbbc6: Merge "VpnDialogs: filter obscured touches"
# Via Android Git Automerger (1) and others
* commit 'a276589ba5439e6b06a4f49de7420fbf45104c80':
  VpnDialogs: filter obscured touches
2013-02-13 17:11:34 -08:00
Jean-Michel Trivi
b5dc902580 am 4627a47d: Merge "Remove obsolete imports"
# Via Android (Google) Code Review
* commit '4627a47d94a5322b9a3cea02645929b260a6ee16':
  Remove obsolete imports
2013-02-13 16:45:44 -08:00
Jean-Michel Trivi
4627a47d94 Merge "Remove obsolete imports" 2013-02-14 00:42:43 +00:00
Kenny Root
56480ef53f VpnDialogs: filter obscured touches
Change-Id: Ifcc919c36006c88e36363f5160f9334df0cf7e5b
2013-02-13 16:32:48 -08:00
Chris Craik
c932760f66 Merge "Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE" 2013-02-13 23:14:58 +00:00
Jean-Michel Trivi
21b1549cac am 0888a067: Merge "Fix AudioFocus for back-to-back notifications"
# Via Android (Google) Code Review (1) and Jean-Michel Trivi (1)
* commit '0888a06762fb55d48646c86c6a0184a0b96cdc24':
  Fix AudioFocus for back-to-back notifications
2013-02-13 11:44:38 -08:00
Jean-Michel Trivi
fc95e673d3 am 23bbe02b: Merge "No AudioFocus for notifications when media played remotely"
# Via Android (Google) Code Review (1) and Jean-Michel Trivi (1)
* commit '23bbe02b363bb96bd56d4008141e8cf800bb46b7':
  No AudioFocus for notifications when media played remotely
2013-02-13 11:41:12 -08:00
Jean-Michel Trivi
0888a06762 Merge "Fix AudioFocus for back-to-back notifications" 2013-02-13 19:40:33 +00:00
Jean-Michel Trivi
23bbe02b36 Merge "No AudioFocus for notifications when media played remotely" 2013-02-13 19:37:45 +00:00
Chris Craik
7c1a49f5f5 Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE
This reverts commit 6c0307dd0aefe9a08794b155fc03ee60ebd14f25, reversing
changes made to a2cd828b749c444d55c2c41c7dbb85088ff94b9f.

Conflicts:
	packages/SystemUI/res/values-sv/strings.xml

Change-Id: Ia178efe8b14751583d47b2826bfe3d3d5463dd2e
2013-02-13 10:50:20 -08:00
Jean-Michel Trivi
562e65bb19 Remove obsolete imports
Change-Id: I67d357a1b0bac89447b1e237f61dd18aea7b912b
2013-02-13 17:52:30 +00:00
Jean-Michel Trivi
6313cbe1d0 Fix AudioFocus for back-to-back notifications
A single instance of NotificationPlayer will play notifications
 back-to-back, and was, for each requesting AudioFocus. But as
 a new notification was about to be played, its accompanying
 thread was terminated, and the completion listener was never
 called, and therefore AudioFocus was not released (e.g. two
 requests for one release).
 The fix consists in requesting AudioFocus only once and
 abandonning it when the only reported completion is received.
 Added a FIXME note about a better solution to be implemented.

Bug 7680947

Change-Id: Ica9d5c1eb5d57c89ceebe66282af69f0f7d43667
2013-02-13 09:41:10 -08:00
Jean-Michel Trivi
97ad2cd1a8 No AudioFocus for notifications when media played remotely
Don't use AudioFocus when playing a notification when media is
 playing remotely. This behavior may be accompanied by
 rules in the device's audio policy to not route the notifications
 to the remote display.

Bug 7485803

Change-Id: I8b96aa59cace75f6e9a0e73799ef8c75e9ee97aa
2013-02-12 15:30:39 -08:00
Michael Jurka
5102122278 am 1af81b6b: Merge "Fix Recents transition for RTL languages"
# Via Android (Google) Code Review (1) and Michael Jurka (1)
* commit '1af81b6bdc589c9fc77c51d29c204eaf64e4ff13':
  Fix Recents transition for RTL languages
2013-02-12 12:02:02 -08:00
Michael Jurka
1af81b6bdc Merge "Fix Recents transition for RTL languages" 2013-02-12 19:58:48 +00:00
Michael Jurka
806b137183 am bde3104d: Merge "Prevent SecurityException from crashing Recents"
# Via Android (Google) Code Review (1) and Michael Jurka (1)
* commit 'bde3104ddce09d03255ff481dfb13bc9e67119e8':
  Prevent SecurityException from crashing Recents
2013-02-12 02:21:18 -08:00
Michael Jurka
bde3104ddc Merge "Prevent SecurityException from crashing Recents" 2013-02-12 10:15:31 +00:00
Dianne Hackborn
906cf04287 am 1d3079cb: Merge "App ops: cleanup, handle root and shell, perms."
# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit '1d3079cb8d477b50d5873e571695d938a6cb4712':
  App ops: cleanup, handle root and shell, perms.
2013-02-11 16:44:40 -08:00
Dianne Hackborn
1d3079cb8d Merge "App ops: cleanup, handle root and shell, perms." 2013-02-12 00:41:07 +00:00
Dianne Hackborn
514074fae8 App ops: cleanup, handle root and shell, perms.
Rework how the shell user is defined so that it is
associated with an actual apk, instead of being a free
roaming uid with special permissions assigned to it.
This allows us to correctly account for its operations
in app ops.

Implement a special case for the root user in app ops --
it is always allowed, always with the package name "root".

Add various code to take care of cleaning up package state
from app ops -- when packages are uninstalled, and during
boot if any packages currently being stored no longer exist.

Also fix a bug in the activity manager to correctly grant
permissions in all cases when onNewIntent() is being called.

Change-Id: Iae9f6d793ee48b93518c984ad957e46ae4582581
2013-02-11 15:33:48 -08:00
Winson Chung
ea8d24b040 am e63fb8f1: Merge "Manually recycling bitmap memory when rotating ss, resetting canvas bitmap, adding logging. (Bug 7974275)"
# Via Android (Google) Code Review (1) and Winson Chung (1)
* commit 'e63fb8f1f92bcae3be2bcb6d521b351dda0f0ae2':
  Manually recycling bitmap memory when rotating ss, resetting canvas bitmap, adding logging. (Bug 7974275)
2013-02-11 15:04:55 -08:00
Winson Chung
e63fb8f1f9 Merge "Manually recycling bitmap memory when rotating ss, resetting canvas bitmap, adding logging. (Bug 7974275)" 2013-02-11 23:01:06 +00:00
Winson Chung
5cc9a31534 Manually recycling bitmap memory when rotating ss, resetting canvas bitmap, adding logging. (Bug 7974275)
Change-Id: I1b0590a297610ee5fee4e68222144780ab6e55ec
2013-02-11 15:00:00 -08:00
Jeff Brown
049bd85fd8 am d5c921f2: am 64f4de03: am fa49a6b1: Merge "frameworks/base: Added English UK keyboard layout for physical keyboards"
# By HeyRatFans
# Via Android Git Automerger (2) and others
* commit 'd5c921f2cf3bc5a33d4d3b650b220cafbdfb6813':
  frameworks/base: Added English UK keyboard layout for physical keyboards
2013-02-08 17:06:17 -08:00
Jeff Brown
d5c921f2cf am 64f4de03: am fa49a6b1: Merge "frameworks/base: Added English UK keyboard layout for physical keyboards"
# By HeyRatFans
# Via Android Git Automerger (1) and others
* commit '64f4de03037b279e389ca20297e9d5086f49564c':
  frameworks/base: Added English UK keyboard layout for physical keyboards
2013-02-08 17:03:38 -08:00
Jeff Brown
64f4de0303 am fa49a6b1: Merge "frameworks/base: Added English UK keyboard layout for physical keyboards"
# By HeyRatFans
# Via Gerrit Code Review (1) and Matt Beale (1)
* commit 'fa49a6b13ebf496ea01d5981f69084596d06d464':
  frameworks/base: Added English UK keyboard layout for physical keyboards
2013-02-08 16:58:09 -08:00
Jeff Brown
fa49a6b13e Merge "frameworks/base: Added English UK keyboard layout for physical keyboards" 2013-02-08 23:49:11 +00:00
Michael Jurka
a2bdffee5b Prevent SecurityException from crashing Recents
Bug: 6787477
2013-02-08 15:41:56 +01:00
Michael Jurka
12cdec9b94 Fix Recents transition for RTL languages
Bug: 8058416

Change-Id: I81dca6dfd6662a94133566bf1efc863df66e33d1
2013-02-08 11:40:21 +01:00
Baligh Uddin
5ef8f22d71 Merge "Import translations. DO NOT MERGE" 2013-02-08 00:55:44 +00:00
Daniel Sandler
8949b2480b am fb2b5e04: am 1fd77470: am 1a1e9b31: Merge "DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock"
# By Jorge Ruesga
# Via Android Git Automerger (2) and others
* commit 'fb2b5e04a02669c764e4ebd7a6daf9846d596435':
  DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock
2013-02-06 22:06:23 -08:00
Daniel Sandler
1fd7747097 am 1a1e9b31: Merge "DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock"
# By Jorge Ruesga
# Via Gerrit Code Review (1) and Jorge Ruesga (1)
* commit '1a1e9b317ac2d737ad92a35c4d806f0fda1ede70':
  DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock
2013-02-06 22:01:39 -08:00
Daniel Sandler
1a1e9b317a Merge "DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock" 2013-02-07 05:09:33 +00:00
Jeffrey Brown
a81a40e06d am 3c239d7e: am 8934c575: am 88ba2f48: Merge "Disable usage of WAL in DatabaseHelper"
# By Yevgen Pronenko
# Via Android Git Automerger (2) and others
* commit '3c239d7e8d78570b1e17ad968c408506e73a8f3f':
  Disable usage of WAL in DatabaseHelper
2013-02-06 20:55:58 -08:00
Jeffrey Brown
8934c57564 am 88ba2f48: Merge "Disable usage of WAL in DatabaseHelper"
# By Yevgen Pronenko
# Via Gerrit Code Review (1) and Johan Redestig (1)
* commit '88ba2f48a2d1193f3877575b2589897a7804aa75':
  Disable usage of WAL in DatabaseHelper
2013-02-06 20:50:09 -08:00
Jeffrey Brown
88ba2f48a2 Merge "Disable usage of WAL in DatabaseHelper" 2013-02-07 04:39:35 +00:00
Maggie Benthall
1095d9ac5d Merge "Fix for SettingsProvider to query for correct user." 2013-02-07 00:04:59 +00:00
Maggie Benthall
d2726582f1 Fix for SettingsProvider to query for correct user.
insertForUser takes a specified user and attempts to adjust that user's
settings, first looking at their existing settings to determine the difference.
However it was querying the settings for the calling user, rather than for
the user whose settings were being changed.

Also add a test that exercises the fix.

Change-Id: I6ed6fd79154ac1b6e6ab880769ac9081dfff6b80
2013-02-06 18:53:47 -05:00
Baligh Uddin
f8cb78ce45 Import translations. DO NOT MERGE
Change-Id: I17a8f545e9858909e2c4c831e4facf7252e284d7
Auto-generated-cl: translation import
2013-02-06 12:38:36 -08:00
Derek Sollenberger
23e500d168 Merge "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" 2013-02-06 12:57:38 +00:00
Dianne Hackborn
961321fe4e App ops: add op for writing settings.
Also fix a build.

And fix a bug that I think was introduced in the multi-user work
that removed the permission check for writing to settings...!

Change-Id: I5945682faa789ffc78fd3546c0df7d03693f106d
2013-02-05 17:22:41 -08:00
Daniel Sandler
8bc623a16e am fc12f1e3: Merge "Log messages to debug stuck status bars."
# Via Android (Google) Code Review (1) and Daniel Sandler (1)
* commit 'fc12f1e37bfa0f9240ed5f6af999a9fbba507fb0':
  Log messages to debug stuck status bars.
2013-02-05 10:29:05 -08:00
Daniel Sandler
fc12f1e37b Merge "Log messages to debug stuck status bars." 2013-02-05 18:25:50 +00:00
Daniel Sandler
2b99a49c2e Log messages to debug stuck status bars.
Bug: 7686690
Change-Id: If9660767a8ce6315dcd4b0c52f377069fefeb7a1
2013-02-05 13:18:07 -05:00
Victoria Lease
63af7a113b am 080df3f3: Merge "dual-mode switching single/multiuser ServiceWatcher"
# Via Android (Google) Code Review (1) and Victoria Lease (1)
* commit '080df3f38fc47f15ad321fff00689dcd07e1d075':
  dual-mode switching single/multiuser ServiceWatcher
2013-02-05 09:45:16 -08:00
Victoria Lease
080df3f38f Merge "dual-mode switching single/multiuser ServiceWatcher" 2013-02-05 17:38:48 +00:00
Victoria Lease
03cdd3d275 dual-mode switching single/multiuser ServiceWatcher
This changelist revises LocationManager's previous multiuser system.

Location provider services that are not multiuser-aware continue to
run as before: ServiceWatcher binds to location provider services as
the current active user. When the device switches from one user to
another, ServiceWatcher unbinds from the old user's location provider
service and binds to the new user's instance.

Now, location provider services that are multiuser-aware or
user-agnostic can declare "serviceIsMultiuser" metadata in their
AndroidManifest.xml to prevent ServiceWatcher from performing this
switching. These services will run as singleton services and will be
expected to handle user switches on their own.

With this feature in, I was able to switch FusedLocationProvider to
run in multiuser mode, sharing the system_server process instead of
running in its own process. The NetworkLocationProvider is unchanged,
still running in singleuser mode, cheerfully oblivious to the
possibility that there might be any user on the device besides the
one it services.

Bug: 8028045
Change-Id: I1a5bd032918419bab6edb46c62ff8c6811170654
2013-02-01 16:00:20 -08:00
Dianne Hackborn
b606eae34d am f265ea9d: App ops: vibration, neighboring cells, dialing, etc.
# Via Dianne Hackborn
* commit 'f265ea9d8307282ff1da3915978625a94fc2859e':
  App ops: vibration, neighboring cells, dialing, etc.
2013-02-01 15:23:41 -08:00
Dianne Hackborn
f265ea9d83 App ops: vibration, neighboring cells, dialing, etc.
Improve handling of vibration op, so that apps are
better blamed (there is now a hidden vibrator API that
supplies the app to blame, and the system now uses this
when vibrating on behalf of an app).

Add operation for retrieving neighboring cell information.

Add a new op for calling a phone number.  This required
plumbing information about the launching package name through
the activity manager, which required changing the internal
startActivity class, which required hitting a ton of code that
uses those internal APIs.

Change-Id: I3f8015634fdb296558f07fe654fb8d53e5c94d07
2013-02-01 15:14:29 -08:00