OSDN Git Service
Irfan Sheriff [Tue, 21 Aug 2012 18:44:01 +0000 (11:44 -0700)]
Fix NPE
Bug:
7026244
Change-Id: I21f13bdbd2d33f0cc082f85474229d9909eb47c1
Guang Zhu [Tue, 21 Aug 2012 04:10:39 +0000 (21:10 -0700)]
Merge "Revert "fix sdcard path for webkit perf and layout test scripts"" into jb-mr1-dev
Guang Zhu [Tue, 21 Aug 2012 04:09:28 +0000 (21:09 -0700)]
Revert "fix sdcard path for webkit perf and layout test scripts"
This reverts commit
8aaa32b13e565893c57059ca14eb49fbe4bdf0ba
Change-Id: I831eb07943c85bb23b43bdf2d9026bf88ed23c5a
Jeff Brown [Tue, 21 Aug 2012 03:28:50 +0000 (20:28 -0700)]
Merge "Disable electron beam on animation." into jb-mr1-dev
Jeff Brown [Tue, 21 Aug 2012 03:25:52 +0000 (20:25 -0700)]
Merge "Plumb the switch code into Dalvik." into jb-mr1-dev
Jeff Brown [Tue, 21 Aug 2012 03:25:14 +0000 (20:25 -0700)]
Merge "Encapsulate locks in UEventObservers." into jb-mr1-dev
Jeff Brown [Tue, 21 Aug 2012 03:17:36 +0000 (20:17 -0700)]
Disable electron beam on animation.
We want the screen to come back on as soon as possible.
Change-Id: Ifdaa2e88d19590c3da53be985dd886633e5cac59
Jeff Brown [Tue, 21 Aug 2012 03:16:01 +0000 (20:16 -0700)]
Plumb the switch code into Dalvik.
Bug:
6548391
Change-Id: If0e918669ba27ca0e6561930d4abc427c34de42d
Jeff Brown [Tue, 21 Aug 2012 03:15:34 +0000 (20:15 -0700)]
Encapsulate locks in UEventObservers.
Synchronized methods make me cry so fixing this first before
I introduce any new functionality that could result in a deadlock.
Bug:
6548391
Change-Id: I9c006dc491ce205bfd86acf828dcebda2a63b2ca
Jeff Brown [Tue, 21 Aug 2012 02:41:48 +0000 (19:41 -0700)]
Merge "Add factory test feature to shut off on long press power." into jb-mr1-dev
John Reck [Tue, 21 Aug 2012 00:33:19 +0000 (17:33 -0700)]
Merge "Support scrolling layers with the mousewheel" into jb-mr1-dev
John Reck [Tue, 21 Aug 2012 00:13:47 +0000 (17:13 -0700)]
Support scrolling layers with the mousewheel
Bug:
6635437
Fix onGenericAction to support scrolling layers.
Calling startScrollingLayer detects if there is a layer under
the mouse pointer, and if so switches to DRAG_LAYER_MODE. Then, calling
doDrag will correctly handle scrolling the layer in DRAG_LAYER_MODE,
switching out of DRAG_LAYER_MODE when we hit the end of a layer, and
scrolling the page if there isn't a layer. It is the method used
by the touch drag path.
Change-Id: I00be09a63c40caa8fce94134c57db0894a62fef0
Brian Muramatsu [Mon, 20 Aug 2012 23:57:13 +0000 (16:57 -0700)]
Merge "add wireless charger support" into jb-mr1-dev
Baligh Uddin [Mon, 20 Aug 2012 22:43:10 +0000 (15:43 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Jean-Baptiste Queru [Mon, 20 Aug 2012 22:26:53 +0000 (15:26 -0700)]
am
f96fcd50: am
26f8ce83: Merge "To avoid the JNI memory leaks in video editor codes"
* commit '
f96fcd5095e751fc9402d8bbecdf59f53e00d854':
To avoid the JNI memory leaks in video editor codes
Jean-Baptiste Queru [Mon, 20 Aug 2012 22:23:16 +0000 (15:23 -0700)]
Merge "resolved conflicts for merge of
4ea6a8eb to jb-mr1-dev" into jb-mr1-dev
Jeff Brown [Mon, 20 Aug 2012 22:09:41 +0000 (15:09 -0700)]
Merge "Adjust auto-brightness time constants." into jb-mr1-dev
Jeff Brown [Mon, 20 Aug 2012 21:59:18 +0000 (14:59 -0700)]
Merge "Fix some proximity sensor bugs." into jb-mr1-dev
Jean-Baptiste Queru [Mon, 20 Aug 2012 21:57:23 +0000 (14:57 -0700)]
resolved conflicts for merge of
4ea6a8eb to jb-mr1-dev
Change-Id: I51b1732011f31ea07087ef0898b47de8977074de
Iliyan Malchev [Mon, 20 Aug 2012 21:57:14 +0000 (14:57 -0700)]
Merge "Revert "Revert "Add timestamp in scan results""" into jb-mr1-dev
Jeff Brown [Mon, 20 Aug 2012 21:56:57 +0000 (14:56 -0700)]
Add factory test feature to shut off on long press power.
Bug:
6847329
Change-Id: I2f4f975c3af2d13ccc06812a5a42e79032700862
Jean-Baptiste Queru [Mon, 20 Aug 2012 21:50:45 +0000 (14:50 -0700)]
am
26f8ce83: Merge "To avoid the JNI memory leaks in video editor codes"
* commit '
26f8ce83e04c4efd10c09bb83cfacdcd154d9450':
To avoid the JNI memory leaks in video editor codes
Jean-Baptiste Queru [Mon, 20 Aug 2012 21:50:40 +0000 (14:50 -0700)]
am
f515c6f4: Merge "Switch widget: Fix ON/OFF option update error"
* commit '
f515c6f4fe4457de1d5c49f78f9dcf6e4379e335':
Switch widget: Fix ON/OFF option update error
Benoit Goby [Mon, 20 Aug 2012 21:48:11 +0000 (14:48 -0700)]
Merge "Add UsbDebuggingManager and UsbDebuggingActivity" into jb-mr1-dev
Jean-Baptiste Queru [Mon, 20 Aug 2012 21:29:51 +0000 (14:29 -0700)]
Merge "To avoid the JNI memory leaks in video editor codes"
Jean-Baptiste Queru [Mon, 20 Aug 2012 21:28:32 +0000 (14:28 -0700)]
Merge "Switch widget: Fix ON/OFF option update error"
rich cannings [Mon, 20 Aug 2012 21:24:49 +0000 (14:24 -0700)]
Merge "Pass URLs to package verifiers" into jb-mr1-dev
Kenny Root [Mon, 20 Aug 2012 21:20:31 +0000 (14:20 -0700)]
Merge "Add AndroidKeyStore provider for KeyStore API" into jb-mr1-dev
Jeff Brown [Mon, 20 Aug 2012 21:02:12 +0000 (14:02 -0700)]
Adjust auto-brightness time constants.
Specifically, dim a little more slowly.
Change-Id: I10d66a83ddc3a63f8c93d740a0cb116e6c974d10
Benoit Goby [Thu, 26 Apr 2012 01:06:00 +0000 (18:06 -0700)]
Add UsbDebuggingManager and UsbDebuggingActivity
The UsbDebuggingManager listens to adbd requests and displays a dialog
when the public key authentification fails, for the user to confirm if it
wants to allow USB debugging from the attached host. If the user chooses
to always allow USB debugging, the UsbDebuggingManager writes the public
key to adbd's config file so that the public key authenfication succeeds
next time.
Change-Id: I115c828331d8e326c380844ee33915d5dff22260
George Mount [Mon, 20 Aug 2012 20:37:54 +0000 (13:37 -0700)]
Merge "Add getDefaultUserAgent to WebSettings." into jb-mr1-dev
Jeff Brown [Mon, 20 Aug 2012 20:24:23 +0000 (13:24 -0700)]
Fix some proximity sensor bugs.
Forgot to clear waiting for proximity negative flag.
Waiting for proximity negative also shouldn't turn the screen off
if it is currently on.
Change-Id: I9885b2f54b185beb961acda44176bc5f11a9f58b
rich cannings [Mon, 20 Aug 2012 20:20:14 +0000 (13:20 -0700)]
Pass URLs to package verifiers
This change passes the originating URL and accompanied referrer to
package verifiers, when available.
Bug:
6544677
Change-Id: I9ebc71bc13f549bd88267e444816151a99bda000
Victoria Lease [Fri, 17 Aug 2012 22:34:01 +0000 (15:34 -0700)]
DO NOT MERGE LocaleSpan makes Han disambiguation easy!
Cherry-pick of I7f1b0d49a2ece957a7b9b5d65d48385bf2c2a668 from master.
I've also provided TextView.setTextLocale() for use in single-language
TextViews.
Change-Id: I5692859bfd2aafc284172454d943afc250b22535
Victoria Lease [Mon, 20 Aug 2012 20:11:43 +0000 (13:11 -0700)]
Merge "DO NOT MERGE Han Preference" into jb-mr1-dev
Kenny Root [Mon, 20 Aug 2012 19:57:36 +0000 (12:57 -0700)]
am
7d5b22af: am
f029c22f: Merge "Use Libcore.os.umask for setting umask"
* commit '
7d5b22afae8525cdf80ba1bf8e18b87d597f830d':
Use Libcore.os.umask for setting umask
Kenny Root [Mon, 20 Aug 2012 19:55:11 +0000 (12:55 -0700)]
am
f029c22f: Merge "Use Libcore.os.umask for setting umask"
* commit '
f029c22f82573e7fee7c7e0cca4439fe78300bac':
Use Libcore.os.umask for setting umask
Iliyan Malchev [Mon, 20 Aug 2012 19:52:35 +0000 (12:52 -0700)]
Revert "Revert "Add timestamp in scan results""
With b/
6979211 fixed, we can reinstate timestamps.
This reverts commit
578531082b8e8c8aa03868e69591b7613b0e8b8e
Change-Id: I5dffc8d9701004f7c6325f21e1e33d1cdd2d05c0
Robert Greenwalt [Mon, 20 Aug 2012 19:52:24 +0000 (12:52 -0700)]
Merge "Update TCP buffer size when switching network type" into jb-mr1-dev
Kenny Root [Mon, 20 Aug 2012 19:45:16 +0000 (12:45 -0700)]
Merge "Add getmtime to Android KeyStore API" into jb-mr1-dev
Kenny Root [Fri, 10 Aug 2012 15:28:37 +0000 (08:28 -0700)]
Add AndroidKeyStore provider for KeyStore API
This introduces a public API for the Android keystore that is accessible
via java.security.KeyStore API. This allows programs to store
PrivateKeyEntry and TrustedCertificateEntry items visible only to
themselves.
Future work should include:
* Implement KeyStore.CallbackHandlerProtection parameter to allow the
caller to request that the keystore daemon unlock itself via the
system password input dialog.
* Implement SecretKeyEntry once that support is in keystore daemon
Change-Id: I382ffdf742d3f9f7647c5f5a429244a340b6bb0a
Kenny Root [Mon, 20 Aug 2012 19:32:14 +0000 (12:32 -0700)]
Merge "Use Libcore.os.umask for setting umask"
Robert Greenwalt [Mon, 20 Aug 2012 18:15:39 +0000 (11:15 -0700)]
Update TCP buffer size when switching network type
Import of non-merging change 41612 from AOSP
When PDP connects in GSM network, the TCP buffer window size is
set to max 8760. If the phone swicthes to UMTS, the TCP buffer
size is not updated to UMTS, i.e. GPRS buffer size is still
used with limited data transfer spead as a result.
This fix makes sure the TCP buffer size is updated when
switching network type.
Change-Id: Ic44a557677ffe629e83ce1f522a9f058bee6e7b2
Kenny Root [Fri, 17 Aug 2012 15:45:55 +0000 (08:45 -0700)]
Use Libcore.os.umask for setting umask
Libcore.os now provides a umask method call, so just use that since it's
available.
Change-Id: I8826fa40bcab3d61a424ff98a8050d3e44f7ec34
Adam Powell [Mon, 20 Aug 2012 18:44:44 +0000 (11:44 -0700)]
Merge "Respect child drawing order when dispatching touch events" into jb-mr1-dev
Dirk Dougherty [Mon, 20 Aug 2012 18:44:07 +0000 (11:44 -0700)]
am
69b6a32f: am
a18cfcca: Doc change: Remove japanese localized index page.
* commit '
69b6a32f0c9df85b29dc8adc2c1f15e5f52dd6ba':
Doc change: Remove japanese localized index page.
Dirk Dougherty [Mon, 20 Aug 2012 18:42:30 +0000 (11:42 -0700)]
am
a18cfcca: Doc change: Remove japanese localized index page.
* commit '
a18cfccac509e124d0a80c109a5711b336d41f75':
Doc change: Remove japanese localized index page.
Dirk Dougherty [Mon, 20 Aug 2012 18:13:27 +0000 (11:13 -0700)]
Doc change: Remove japanese localized index page.
Change-Id: I69b60435e7062d6ec39fe91595232695a37f591d
Jean-Baptiste Queru [Mon, 20 Aug 2012 17:47:46 +0000 (10:47 -0700)]
am
6a37a254: am
e0024573: Merge "Release JNI local references as soon as possible."
* commit '
6a37a254507bb2bff944a0fe984e287994c31846':
Release JNI local references as soon as possible.
Amith Yamasani [Mon, 20 Aug 2012 17:47:41 +0000 (10:47 -0700)]
am
ff7735b0: am
a3db5297: Merge "ProviderMap: remove hashmap when entire user specific entries are removed"
* commit '
ff7735b0ee8c3347d0f3cb1866e454be0e9534e2':
ProviderMap: remove hashmap when entire user specific entries are removed
Jean-Baptiste Queru [Mon, 20 Aug 2012 17:45:17 +0000 (10:45 -0700)]
am
e0024573: Merge "Release JNI local references as soon as possible."
* commit '
e00245737cc4844b77f95538e0728a4166b856a0':
Release JNI local references as soon as possible.
Amith Yamasani [Mon, 20 Aug 2012 17:45:12 +0000 (10:45 -0700)]
am
a3db5297: Merge "ProviderMap: remove hashmap when entire user specific entries are removed"
* commit '
a3db5297cda370ce41db99b6839cd9528c31ef7c':
ProviderMap: remove hashmap when entire user specific entries are removed
Craig Mautner [Mon, 20 Aug 2012 17:30:00 +0000 (10:30 -0700)]
Merge "Ensure that mAllAppWinAnimators is not null." into jb-mr1-dev
Craig Mautner [Mon, 20 Aug 2012 17:18:34 +0000 (10:18 -0700)]
Ensure that mAllAppWinAnimators is not null.
The method showAllWindowsLocked can be called from the layout
side of the WindowManagerService. Previously the AppWindowAnimator
member mAllAppWinAnimators was created on the animation side. If
showAllWindowsLocked was called before the first animation of the
activity an NPE would occur. This fix creates mAllAppWinAnimators
when the AppWindowAnimator is created and also updates it with
current values before calling showAllWindowsLocked.
Fixes bug
6917136.
Change-Id: If3ace22022b65c6888bbb9d0575efe9a45d86475
Jean-Baptiste Queru [Mon, 20 Aug 2012 17:17:44 +0000 (10:17 -0700)]
Merge "Release JNI local references as soon as possible."
Amith Yamasani [Mon, 20 Aug 2012 17:16:36 +0000 (10:16 -0700)]
Merge "ProviderMap: remove hashmap when entire user specific entries are removed"
Brian Muramatsu [Tue, 14 Aug 2012 22:21:02 +0000 (15:21 -0700)]
add wireless charger support
bug:
6879638
- add new enum value BATTERY_PLUGGED_WIRELESS
- check for sys online file with contents "Wireless"
Change-Id: I22dc3c40f50573c98643e7b5cbcb237d0216530d
Kenny Root [Sat, 18 Aug 2012 04:13:48 +0000 (21:13 -0700)]
Add getmtime to Android KeyStore API
java.security.KeyStore requires that you be able to get the creation
date for any given entry. We'll approximate that through using the mtime
of the file in the keystore.
Change-Id: I16f74354a6c2e78a1a0b4dc2ae720c5391274e6f
Baligh Uddin [Mon, 20 Aug 2012 16:03:10 +0000 (09:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0a089cb1cb31c163d332fae1afaeeabf148b5ce9
Auto-generated-cl: translation import
Przemyslaw Szczepaniak [Thu, 16 Aug 2012 15:34:54 +0000 (16:34 +0100)]
Fix double call to TTS connection disconnect() on reconnect
- Sets the service connection to null when unbindService is called,
instead of in onServiceDisconnected. This avoids a double disconnect
if a call to onServiceConnected is received before a call to
onServiceDisconnected.
- Extended synchronize on runAction error handling and reconnection.
This prevents from reconnecting N times if N>1 threads enter this method
while there's issue with TTS service.
Bug:
6993880
Change-Id: I5a387622c6032a18d17fc072029ae6be1a9b8e6c
Billy Hewlett [Wed, 18 Jul 2012 16:51:45 +0000 (09:51 -0700)]
DO NOT MERGE Han Preference
Cherry-pick Ib5dd86950156c5a438f25c289acb839206bb455a from master.
Data: label MTLmr3m with "ja" locale attribute, fallback_fonts-ja.xml removed,
as we only need a single fallback font file
Code: Add locale and variant to TextLayoutCache. Paint.java sets textLocale as
the language (for example, "ja") rather than the language/locale concatenated
(for example "ja_JP")
This checkin, along with Change-Id: Id8c91ae0be6cad8a7ef77a0cd5803676290986c1,
allows text view objects to set their locale dynamically and skia will use the
correct font for the locale.
Change-Id: Ieb60b0d7a39fcfef4f8ce90cd4f6065d33673710
Jeff Brown [Mon, 20 Aug 2012 06:20:02 +0000 (23:20 -0700)]
Improve display manager debugging.
Change-Id: Iae794fe99a7cf9809f64eafb216091126a2f7e39
Jeff Brown [Mon, 20 Aug 2012 03:30:52 +0000 (20:30 -0700)]
Refactor for multi-display support.
Split WindowManagerImpl into two parts, the WindowManager
interface implementation remains where it is but the global
communications with the window manager are now handled by
the WindowManagerGlobal class. This change greatly simplifies
the challenge of having separate WindowManager instances
for each Context.
Removed WindowManagerImpl.getDefault(). This represents the
bulk of this change. Most of the usages of this method were
either to perform global functions (now handled by WindowManagerGlobal)
or to obtain the default display (now handled by DisplayManager).
Explicitly associate each new window with a display and make
the Display object available to the View hierarchy.
Add stubs for some new display manager API features.
Start to split apart the concepts of display id and layer stack.
since they operate at different layers of abstraction.
While it's true that each logical display uniquely corresponds to a
surface flinger layer stack, it is not necessarily the case that
they must use the same ids. Added Display.getLayerStack()
and started using it in places where it was relatively easy to do.
Change-Id: I29ed909114dec86807c4d3a5059c3fa0358bea61
Jeff Brown [Mon, 20 Aug 2012 03:18:08 +0000 (20:18 -0700)]
Stub out display manager service implementation.
Reverting to the previous stub as the display adapter registration
and the logical to physical mapping is not at all what we are going
to need moving forward.
Fixed up the service initialization order so that the display manager
service has a context from the start.
Change-Id: I717f2f1099c7a77180ef207c371ec8329258850a
Guang Zhu [Sun, 19 Aug 2012 22:29:07 +0000 (15:29 -0700)]
Merge "fix sdcard path for webkit perf and layout test scripts" into jb-mr1-dev
Guang Zhu [Sun, 19 Aug 2012 22:27:40 +0000 (15:27 -0700)]
fix sdcard path for webkit perf and layout test scripts
paths are moved from /sdcard/ to /sdcard/0/
Change-Id: I27dee294eff033da47c5de17c3b7843790386be3
Amith Yamasani [Sun, 19 Aug 2012 14:55:13 +0000 (07:55 -0700)]
Merge "Fixed static wallpaper for multi-user" into jb-mr1-dev
Amith Yamasani [Sun, 19 Aug 2012 14:54:36 +0000 (07:54 -0700)]
Merge "Don't create cache directory for isolated processes" into jb-mr1-dev
Amith Yamasani [Sun, 19 Aug 2012 05:13:07 +0000 (22:13 -0700)]
Fixed static wallpaper for multi-user
Earlier assumption that systemui was running in the system process
does not hold true, so running static wallpaper in its own user
sandbox.
Bug:
7008230
Change-Id: I32a128e6bbd8efa7006286330e970bafcf37f05a
Amith Yamasani [Sat, 18 Aug 2012 01:00:52 +0000 (18:00 -0700)]
Don't create cache directory for isolated processes
They don't have access anyway
This makes Chrome work in secondary users
Change-Id: I4d30581bc6e807901e642893d6964854c0567fec
Dianne Hackborn [Sat, 18 Aug 2012 00:39:08 +0000 (17:39 -0700)]
Merge "More view hierarchy, fragment debugging." into jb-mr1-dev
Dianne Hackborn [Fri, 17 Aug 2012 22:18:29 +0000 (15:18 -0700)]
More view hierarchy, fragment debugging.
Add a View.toString() method.
Rename all of the View private flags to have a PFLAG prefix to
avoid going insane trying to figure out which constant goes with
which flag.
Activity.dump() now includes a summary of the activity's view
hierarchy, using the View.toString() method.
All exceptions thrown by FragmentManager now perform a dump of
the owning activity state, where appropriate.
Change-Id: I6482e397e10cb5a0612ab02ce6ed5131823437a6
Amith Yamasani [Sat, 18 Aug 2012 00:08:33 +0000 (17:08 -0700)]
Merge "Fix build part 2" into jb-mr1-dev
Amith Yamasani [Sat, 18 Aug 2012 00:07:14 +0000 (17:07 -0700)]
Fix build part 2
Change-Id: I3b4ed430f214468a22d3b3aaf3605e570cfd0ed1
Dianne Hackborn [Sat, 18 Aug 2012 00:01:47 +0000 (17:01 -0700)]
Merge "Fix permission check on ContentProvider to be multi-user aware." into jb-mr1-dev
Dianne Hackborn [Fri, 17 Aug 2012 23:51:54 +0000 (16:51 -0700)]
Fix permission check on ContentProvider to be multi-user aware.
Change-Id: I1e504fe6561caef99d478e37660e2294fec7ea8b
Adam Powell [Fri, 17 Aug 2012 23:40:00 +0000 (16:40 -0700)]
Respect child drawing order when dispatching touch events
Make sure that touch events are always dispatched to the "topmost"
view when views overlap.
Bug
6996501
Change-Id: I4df25dd7531c4b268c8377c0bf0945ab862733b9
Amith Yamasani [Fri, 17 Aug 2012 23:34:53 +0000 (16:34 -0700)]
Fix merge error
Didn't apply the recent API change from another CL.
Change-Id: I65ac6108909eca7ac48beabb4a8b7bbedda84249
Chet Haase [Fri, 17 Aug 2012 23:19:37 +0000 (16:19 -0700)]
Merge "Fix glyph cropping bug" into jb-mr1-dev
Amith Yamasani [Fri, 17 Aug 2012 23:19:18 +0000 (16:19 -0700)]
Merge "Save preferred activity info with user id." into jb-mr1-dev
Chet Haase [Fri, 17 Aug 2012 22:44:44 +0000 (15:44 -0700)]
Fix glyph cropping bug
Glyphs were being stored in the glyph cache incorrectly.
The second row of glyphs in any column were being positioned exactly
one pixel too high, causing the preceding glyph in that column to be
cropped, resulting in the reported truncation in some glyphs.
Issue #
7003215 Minor UI truncation while reading the mails
Change-Id: I47ce376f78a04d4e07e8b7ed1b3f0b58864c5498
Henrik B Andersson [Fri, 10 Feb 2012 12:17:40 +0000 (13:17 +0100)]
Release JNI local references as soon as possible.
The JNI layer has a fix amount (512) of jni references.
They should be released as soon as possible. In for
and while loops they can quickly reach the limit.
Change-Id: Id984345e1cc4f7aa6eb31a263b796c3da9edf773
Amith Yamasani [Fri, 17 Aug 2012 22:54:18 +0000 (15:54 -0700)]
Merge "Fix launching activity from a pending intent" into jb-mr1-dev
George Mount [Fri, 10 Aug 2012 22:29:30 +0000 (15:29 -0700)]
Add getDefaultUserAgent to WebSettings.
Bug
6329117
Add ability to get the default user-agent without creating
a WebView. The method is implemented for WebSettingsClassic.
Change-Id: Id15fb57f65875752ccf644481a22b88644635f5d
Nick Pelly [Fri, 17 Aug 2012 22:09:44 +0000 (15:09 -0700)]
Fix addGeofence() and addProximityAlert().
Need to clear the callers identity before calling into geofence manager
because it in turn calls fused location API's.
Change-Id: I7993b0b8b2a947ff93c37a7c9d29ca0e7c95f9a8
Nick Pelly [Fri, 17 Aug 2012 21:43:49 +0000 (14:43 -0700)]
Port location blacklist code to MR1.
I had to re-do this change for MR1 because LocationManagerService changed
so much. Here is the original change description:
Add package-name-prefix blacklist for location updates.
The Settings.Secure value locationPackagePrefixBlacklist and
locationPackagePrefixWhitelist contains comma seperated package-name
prefixes.
Location & geo-fence updates are silently dropped if the receiving
package name has a prefix on the blacklist. Status updates are
not affected. All other API's work as before.
A content observer is used so run-time updates to the blacklist
apply immediately. There is both a blacklist and a whitelist.
The blacklist applies first, and then exemptions are allowed
from the whitelist. In other words, if your package name prefix
matches both the black AND white list, then it is allowed.
Bug:
6986553
Change-Id: I1e151e08bd7143e47db005bc3fe9795076398df7
Amith Yamasani [Fri, 17 Aug 2012 21:17:57 +0000 (14:17 -0700)]
Fix launching activity from a pending intent
The creator of the pending intent is the user on which the activity
should be launched.
Change-Id: I733326ed8a5784985ac93a84ce91de4dda17c730
Amith Yamasani [Fri, 17 Aug 2012 20:58:17 +0000 (13:58 -0700)]
Merge "Send USER_SWITCHED with the correct permission" into jb-mr1-dev
Amith Yamasani [Fri, 17 Aug 2012 20:55:02 +0000 (13:55 -0700)]
Send USER_SWITCHED with the correct permission
Forgot to change this from MANAGE_ACCOUNTS to MANAGE_USERS.
Change-Id: Ib07d2ac84c19cef278a0e564676b6200e0f97dd1
Robert Greenwalt [Fri, 17 Aug 2012 20:44:54 +0000 (13:44 -0700)]
am
c48ee604: (-s ours) am
6626398a: Merge "Fix for updating TCP buffer size when switching network type"
* commit '
c48ee60426a741d0a8e7df7df8af2a9ac24cee85':
Fix for updating TCP buffer size when switching network type
Amith Yamasani [Fri, 10 Aug 2012 00:11:28 +0000 (17:11 -0700)]
Save preferred activity info with user id.
So each user can have their own set of intent resolution preferences.
ResolverActivity now launches the activity on the correct user, and
persists the preference for the correct user.
Bug:
6961905
Change-Id: I6d3a8a9af89bc649277d4fc8d0f367ee123f8392
Jonathan Dixon [Fri, 17 Aug 2012 20:30:46 +0000 (13:30 -0700)]
Merge "Remove checkThread() from findAddress" into jb-mr1-dev
Robert Greenwalt [Fri, 17 Aug 2012 20:28:25 +0000 (13:28 -0700)]
am
6626398a: Merge "Fix for updating TCP buffer size when switching network type"
* commit '
6626398a72ae592e3a9184c9b0868df0fc1f1724':
Fix for updating TCP buffer size when switching network type
John Reck [Fri, 17 Aug 2012 20:04:24 +0000 (13:04 -0700)]
Remove checkThread() from findAddress
Bug:
6811978
This doesn't need checked thread safety - static util methods should
be thread safe.
Change-Id: Ib652d74ced66e3fa332464106a38522cd941a4cd
Michael Jurka [Fri, 17 Aug 2012 20:03:15 +0000 (13:03 -0700)]
Merge "Adding a thumbnail scale down animation" into jb-mr1-dev
Robert Greenwalt [Fri, 17 Aug 2012 20:01:49 +0000 (13:01 -0700)]
Merge "Fix for updating TCP buffer size when switching network type"
Nick Pelly [Fri, 17 Aug 2012 18:57:52 +0000 (11:57 -0700)]
Merge "Fix regression from location changes: GPS battery tracking." into jb-mr1-dev
Nick Pelly [Fri, 17 Aug 2012 18:55:10 +0000 (11:55 -0700)]
Fix regression from location changes: GPS battery tracking.
The client UID list wasn't being saved, so we never removed
client UID's. As a result apps get blamed for GPS even when
they are no longer using it.
Bug:
7007314
Change-Id: Idff3b7c8c0ee87b99c9bdd7bd20d8391d0b1ac0f
Dianne Hackborn [Thu, 16 Aug 2012 23:42:52 +0000 (16:42 -0700)]
Switch public APIs to use new UserHandle class for identifying users.
Gets rid of "yet another integer" confusion.
Change-Id: Id07ea7307aea7c62f0087c6663a1f1c08e2e5dee
Jean-Baptiste Queru [Fri, 17 Aug 2012 17:15:32 +0000 (10:15 -0700)]
am
21bf4657: am
a688af9c: Merge "TabHost key handling corrected"
* commit '
21bf465764938c5f8c82dbf6061c89e138eb73ca':
TabHost key handling corrected