OSDN Git Service
Dianne Hackborn [Fri, 7 Mar 2014 18:12:30 +0000 (18:12 +0000)]
Merge "More on issue #
12031685 (DO NOT MERGE)" into klp-dev
Andy McFadden [Fri, 7 Mar 2014 17:40:39 +0000 (17:40 +0000)]
Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev
Chris Wren [Fri, 7 Mar 2014 15:08:29 +0000 (15:08 +0000)]
Merge "use relative positioning for notification actions" into klp-dev
Dianne Hackborn [Fri, 7 Mar 2014 01:39:11 +0000 (17:39 -0800)]
More on issue #
12031685 (DO NOT MERGE)
Integrate from master:
Fix issue #
13065185: Frequent runtime restarts on launching...
..."Hill Climb Racing" app
A service is in use when it is in the restarting state.
Change-Id: Iffdea96f867f89089e7ad07b4b1bef056951a5e8
Marco Nelissen [Fri, 7 Mar 2014 01:16:49 +0000 (01:16 +0000)]
Merge "ExifInterface: fix class load failure" into klp-dev
Dianne Hackborn [Fri, 7 Mar 2014 01:04:50 +0000 (01:04 +0000)]
Merge "Fix issue #
13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev
Zhijun He [Fri, 20 Dec 2013 21:28:00 +0000 (13:28 -0800)]
ExifInterface: fix class load failure
libexif_jni was renamed as libjhead_jni
b/
12203995
Change-Id: I0ceff1ad288c7ce2255826d5d5ba9ca1f121a556
Svetoslav [Fri, 7 Mar 2014 00:37:14 +0000 (00:37 +0000)]
Merge "ProgressBar is important for accessibility by default." into klp-dev
Marco Nelissen [Fri, 7 Mar 2014 00:34:36 +0000 (00:34 +0000)]
Merge "libexif is now libjhead" into klp-dev
Marco Nelissen [Thu, 19 Dec 2013 22:21:19 +0000 (14:21 -0800)]
libexif is now libjhead
b/
12203995
Change-Id: I6b749e251a2e03738550ce911e59527f80d26212
Jay Shrauner [Fri, 7 Feb 2014 21:28:59 +0000 (13:28 -0800)]
Prevent SpellChecker from setting invalid range - DO NOT MERGE
Add check for invalid range before setting for further check
at end of parse() loop.
Bug:
12936072
Change-Id: Ie0b33b8e69fe47e5d3371640be5681f13a4e4f6e
(cherry picked from commit
ea4adf28474d949c51518a5abe6dbd3a3529cf29)
Takahiro Aizawa [Wed, 11 Dec 2013 10:22:26 +0000 (19:22 +0900)]
EGL14.eglCreateWindowSurface should set producerControlledByApp
Interface of Surface class changed.
To reflect the change for EGL14, add producerControlledByApp flag.
Similar change can be seen in
0fa257fe53bf520bdde93996a1901ce6bc3e1788
Bug
13226025
(cherry-pick from AOSP Ic8911d3131e033747cfdabe59ac2fea1e90bb4a0)
Change-Id: I853484c38f065d71b365bb48b2a794ca4787e70a
Leon Scroggins III [Wed, 15 Jan 2014 19:23:14 +0000 (14:23 -0500)]
DO NOT MERGE - Fix Javadoc build break.
Remove links to non-specific function name.
Bug:
13246311
Change-Id: I5643074149d0a511bd760d638751c44e3ec4c557
(cherry picked from commit
2bc49ca96eb786f66dc2b9573e1f09bdb2d82d5e)
Chris Wren [Tue, 3 Dec 2013 19:31:01 +0000 (14:31 -0500)]
use relative positioning for notification actions
Bug:
10531101
Change-Id: Ia1d7cac880f620a9760271344edf920caf0d852d
Leon Scroggins III [Thu, 6 Mar 2014 19:37:28 +0000 (19:37 +0000)]
Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev
Svetoslav [Mon, 13 Jan 2014 23:25:58 +0000 (15:25 -0800)]
ProgressBar is important for accessibility by default.
If a view does not have callbacks, or content description, or does not draw
content, and it is marked as important for accessibility auto, then the system
decides it is not important and does not report it. Apparently progress bar
draws content that means something and it should be important for accessibility
by default.
Change-Id: Icd3837fb8b9e208c98b90707f3b195622d71949e
(cherry picked from commit
7face75f2c655a371a4dcdf6063886f92c637ce4)
Eric Laurent [Thu, 6 Mar 2014 19:21:26 +0000 (19:21 +0000)]
Merge "Fix RemoteController synchronization mode" into klp-dev
Dianne Hackborn [Thu, 6 Mar 2014 18:52:05 +0000 (10:52 -0800)]
Fix issue #
13199860: PRE_BOOT_COMPLETED intent is...
...broadcasted repeatedly at every boot time
Remember the last done pre-boot receivers, so that if we have
a new pre boot receiver appearing (without the platform version
changing), when we re-write the file of done receivers it will
contain all of them, not just the new one.
Change-Id: I4ed3478edc549d4b023ec4b3719111bc4d970ae4
Dianne Hackborn [Thu, 6 Mar 2014 18:29:19 +0000 (18:29 +0000)]
Merge "Fix issue #
11536426 DO NOT MERGE" into klp-dev
Dianne Hackborn [Mon, 2 Dec 2013 18:04:42 +0000 (10:04 -0800)]
Fix issue #
11536426 DO NOT MERGE
Permission denied when trying to launch an activity from a notification
We don't remove pending intents when updating an app, which is necessary
to keep app widgets and other things working. However, when uninstalling
an app, we should clear out all of its pending intents.
Change-Id: I95067b31098115b5a7b127766fd093750063bbb8
Santos Cordon [Tue, 4 Mar 2014 00:06:54 +0000 (16:06 -0800)]
Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
bug:
12175514
Change-Id: I37dba7eedbf86c0b87ce559a52fe0b15c6911bfa
(cherry picked from commit
b4aeac730503eb4b9db7d2dcece48e1ca13b4b30)
Jean-Michel Trivi [Thu, 2 Jan 2014 23:08:26 +0000 (15:08 -0800)]
Fix RemoteController synchronization mode
Fix erroneous argument check in RemoteController syncrhonization
mode setter..
Bug
12189375
Change-Id: Ic2b70ec48cacc6d10f17762387b52b4e4304aa10
Leon Scroggins III [Tue, 3 Dec 2013 21:26:51 +0000 (16:26 -0500)]
Update framework to use M33 Skia. DO NOT MERGE
(These CLs are already in master.)
Bug:
13246311
This cherry-picks 7 CLs:
-----------------------------------------------------------------------
Remove calls to deprecated SkBitmap::setIsOpaque()
setIsOpaque() has been removed from ToT Skia.
Update setters for mIsPremultiplied and hasAlpha to take the
other into consideration.
cherry-pick from: I1b36b0b0ce7126031eb7b769b563c17dcd4b306a
-----------------------------------------------------------------------
Merge AssetStream with AssetStreamAdaptor.
Add enums to the constructor for AssetStreamAdaptor to choose the
different behaviors used by the (former) two different classes.
The old clients of AssetStream now get the following features of
AssetStreamAdaptor
- Debugging statements on error.
- The stream is an SkStreamRewindable.
- getLength() returns the correct value, and the old way of getting
the length (read(NULL, 0)) is no longer implemented, since it is
no longer used.
- isAtEnd() returns the correct value. ToT Skia makes it pure virtual,
so some implementation is necessary.
cherry-pick from: I2a5395914e4f53830aaefee396556459083a1c56
-----------------------------------------------------------------------
Deprecate Android-specific SkPaint functions.
The following functions were problematic:
const SkGlyph& getUnicharMetrics(SkUnichar, const SkMatrix*);
const SkGlyph& getGlyphMetrics(uint16_t, const SkMatrix*);
const void* findImage(const SkGlyph&, const SkMatrix*);
Replacing them with calls through SkGlyphCache solved a nasty crash
bug, so they have all been deprecated.
Bug:
11968757
cherry-pick from: Id746315d41aec5b211b78b172a883c2061130f08
-----------------------------------------------------------------------
pass SkGlyphCache into updateGlyphCache()
Doing so prevents us from double-locking the glyph cache, thereby
effectively locking ourselves out of reusing work that we'd just done.
Bug:
11968757
cherry-pick from: I5c552f2d0bbe30af2ce9054ba684e7da756a0d89
-----------------------------------------------------------------------
Updates to the Skia API needed to merge the WebView m33 version of Skia.
cherry-pick from: I0f63b53f2aae58871413b132742fc84138f069a3
Bugfix for screenshots (recent apps) due to incorrect rowBytes computation
bug:
12915192
cherry-pick from: I4d5fe2a2f75baf66099e0970fb646686a1992714
-----------------------------------------------------------------------
Fix bug in AndroidPixelRef where we did not store the correct imageInfo for a recycled bitmap.
cherry-pick from: I882483b78886e2f19fa4e43a86e69f5a82b3b7e5
-----------------------------------------------------------------------
Change-Id: Ie2b731a9f0795802418cfecddb4b684c92c64d33
Baligh Uddin [Thu, 6 Mar 2014 17:00:46 +0000 (17:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Santos Cordon [Thu, 6 Mar 2014 01:54:20 +0000 (01:54 +0000)]
Merge "Update permission description string." into klp-dev
Michael Wright [Thu, 6 Mar 2014 00:50:15 +0000 (00:50 +0000)]
Merge "Revert Japanese special case fallback keys." into klp-dev
Fabrice Di Meglio [Thu, 6 Mar 2014 00:29:34 +0000 (00:29 +0000)]
Merge "Fix bug #
12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev
Fabrice Di Meglio [Thu, 6 Mar 2014 00:29:20 +0000 (00:29 +0000)]
Merge "Fix bug #
12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev
Dirk Dougherty [Mon, 3 Mar 2014 22:05:21 +0000 (14:05 -0800)]
Update permission description string.
Change-Id: I6cd5895d78bff4f6f3fc8090e13a9ddbd83a1978
(cherry picked from commit
08d7c2861fee205a314c3847ab5f5894617a233b)
Dianne Hackborn [Fri, 17 Jan 2014 21:29:21 +0000 (13:29 -0800)]
Issue #
13308712: Add --checkin to package manager dump.
Change-Id: I50a559ea4bded47a792e1b5b319a5bbed41b4233
Fabrice Di Meglio [Tue, 10 Dec 2013 00:40:14 +0000 (16:40 -0800)]
Fix bug #
12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE
- fix the NPE by checking the validity of the child reference retrieved by View.getChildAt(...)
Change-Id: I61b9233345a4f1110aa06ea563a81dcdf6b35783
Fabrice Di Meglio [Tue, 7 Jan 2014 00:30:43 +0000 (16:30 -0800)]
Fix bug #
12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE
- force TextView internal layout recreation when its TextDirection is changed
Change-Id: I7d6b088a9235362e03cb6694392df71bbf5a323a
(cherry picked from commit
22228fec05129af9684f95d7a13aeff92144bd90)
Robert Greenwalt [Wed, 5 Mar 2014 18:23:56 +0000 (18:23 +0000)]
Merge "Only apply tcp buffer sizes for default net" into klp-dev
Baligh Uddin [Wed, 5 Mar 2014 17:58:27 +0000 (09:58 -0800)]
Import translations. DO NOT MERGE
Change-Id: I04b3a1aaa779644d884edf77fd94dc8dccd1e36b
Auto-generated-cl: translation import
Christopher Tate [Wed, 5 Mar 2014 00:51:32 +0000 (00:51 +0000)]
Merge "Adapt to underlying changes in the PBKDF2 implementation" into klp-dev
Christopher Tate [Wed, 5 Mar 2014 00:51:04 +0000 (00:51 +0000)]
Merge "Update PackageMonitor to recognize new 'replacing' semantics" into klp-dev
John Spurlock [Tue, 4 Mar 2014 19:09:20 +0000 (19:09 +0000)]
Merge "Volume panel should not clear system ui flags." into klp-dev
John Spurlock [Tue, 4 Mar 2014 19:08:46 +0000 (19:08 +0000)]
Merge "Show hideycling for non-primary users." into klp-dev
John Spurlock [Tue, 4 Mar 2014 19:08:31 +0000 (19:08 +0000)]
Merge "Allow lights-out + bar icon dimming on low-end devices." into klp-dev
Guang Zhu [Thu, 20 Feb 2014 01:58:38 +0000 (17:58 -0800)]
use min app launch time in AppLaunch perf test
Change-Id: Id3a5872ff29fba5daeff058f0842fd011e50a0a1
(cherry picked from commit
2861a89bed9066e206917c41357a5e589e8482cb)
Robert Greenwalt [Sat, 1 Mar 2014 00:44:00 +0000 (16:44 -0800)]
Only apply tcp buffer sizes for default net
This may mean that secondary networks have bad network settings,
but currently default settings are overriden by secondary nets
which seems worse.
bug:
13211589
Change-Id: I08d56e618208781bf6b21a88663c2b8503a4f226
John Spurlock [Wed, 4 Dec 2013 18:47:36 +0000 (13:47 -0500)]
Volume panel should not clear system ui flags.
Remove private WM flag (used only by the volume panel) to force
the clearable system UI flags clear.
Instead, always lay out the volume panel as if the bars are visible,
as we do for system dialogs - and don't clear the flags.
Reverts part of I25f29af5b6518aba695b64a75977ae240b742118
Bug:
11986621
Change-Id: I842729d729d2a6eb2a687d0b930ddb160c6a1b57
John Spurlock [Mon, 9 Dec 2013 16:59:45 +0000 (11:59 -0500)]
Show hideycling for non-primary users.
User 0 owns the window (system_server) but should be allowed
to display on a user's behalf.
Use the corresponding private flag for this system window, since
we cannot classify it by type (TYPE_TOAST) in policy.
Bug:
12015090
Change-Id: I33aedb4624288415a5e1ae937676b693024546a9
John Spurlock [Tue, 14 Jan 2014 19:51:23 +0000 (14:51 -0500)]
Allow lights-out + bar icon dimming on low-end devices.
Maintain fallback to OPAQUE mode on low-end devices in place of the
translucent modes.
Bug:
12546110
Change-Id: Ia3582c305cb09aadd56c6aa58b039a174675c79a
Yorke Lee [Tue, 10 Dec 2013 17:51:40 +0000 (09:51 -0800)]
Reword the "Quick contacts not available" string
Bug:
12077052
Change-Id: I6006692ae13d79d3697242d0b9015b30b1826eab
(cherry picked from commit
89b366fa95f625275f1b94d800d22998f942ab8c)
Christopher Tate [Mon, 13 Jan 2014 21:48:22 +0000 (13:48 -0800)]
Adapt to underlying changes in the PBKDF2 implementation
We need to specify "PBKDF2WithHmacSHA1And8bit" now in order to get precisely
the same output as was previously generated with "PBKDF2WithHmacSHA1". We
also now try both when it's ambiguous which was used to generate the archive
checksums.
Bug
12494407
Cherry-pick from master.
Change-Id: I2d6081dd62f50f7d493045150b327ed120de7abd
Christopher Tate [Thu, 9 Jan 2014 00:54:25 +0000 (16:54 -0800)]
Update PackageMonitor to recognize new 'replacing' semantics
The ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE broadcast now uses the
EXTRA_REPLACING intent extra when it is sent as part of an upgrade operation
on a forward-locked application. Update PackageMonitor to recognize this
new information and express it appropriately to the observer.
Bug
11988313
Cherry-pick from master.
Change-Id: Iecea1876ffc918f23f9fa5845f1f89ed8d740dd5
Jay Shrauner [Mon, 3 Mar 2014 21:56:17 +0000 (21:56 +0000)]
Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev
Jonathan Dixon [Thu, 10 Oct 2013 00:28:13 +0000 (17:28 -0700)]
DO NOT MERGE: Fix build after checkThread fix merge to master
Follow up to Change-Id: Ibc2496d5cef97b4685e001086f712fcaac231024 - this
method did not exist in klp-dev branch.
Change-Id: Ie64dd3b2357e0abefb4c7d3492f02d23d347f89f
(cherry picked from commit
b212b9f2ba709273b3d46a1ef3b091eb2292c917)
Cherry pick to klp-dev as part of Bug:
13246014
Bart Sears [Mon, 3 Mar 2014 18:42:27 +0000 (18:42 +0000)]
Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev
Primiano Tucci [Thu, 5 Sep 2013 11:01:51 +0000 (12:01 +0100)]
DO NOT MERGE: Adding freeMemoryForTests static method to WebView.
This is going to be used by pagecycler tests.
See: b/
10629847
Change-Id: Ie3fda214e7808429d7ed63734ab301525f58513f
(cherry pick of
244267500254daff8745f8c0fae3edcac735873f)
Cherry pick to klp-dev as part of Bug:
13246014
Conflicts:
core/java/android/webkit/WebViewClassic.java
core/java/android/webkit/WebViewFactoryProvider.java
(cherry picked from commit
54daaf1cffddad6366fac2ccfceb1e042dd8e90e)
Change-Id: I8471ee5cfaac2ff72704c2391a1961f441aaa1e6
rich cannings [Mon, 3 Mar 2014 17:19:00 +0000 (17:19 +0000)]
Merge "Make FORCE_STOP_PACKAGES "signature|system"" into klp-dev
Yorke Lee [Sat, 7 Dec 2013 00:35:29 +0000 (16:35 -0800)]
Catch ActivityNotFoundException in quick contacts badge
Bug:
12015287
Change-Id: I2fa5daaa54cc7cc0cad9dee0828d751302cb5be7
(cherry picked from commit
4fc601a650405bfba99bcd40429376113bd9492a)
Paul Lawrence [Thu, 27 Feb 2014 22:21:05 +0000 (22:21 +0000)]
am
657dbc40: am
b3776881: am
8b916936: am
2e582d13: am
9bce4032: am
08ee74b1: am
ea5586ef: am
4be7c61a: am
5677513b: am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
657dbc40427c17cbf31be1a17cf2fa7a4116722a':
Prevent authenticators from using Settings to launch arbitrary activities.
Carlos Valdivia [Thu, 27 Feb 2014 22:21:01 +0000 (22:21 +0000)]
am
55cab009: (-s ours) am
9272db02: am
c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
55cab009f0c9b1939f8336e26144850a5fdc9d3a':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 20:04:07 +0000 (12:04 -0800)]
am
b3776881: am
8b916936: am
2e582d13: am
9bce4032: am
08ee74b1: am
ea5586ef: am
4be7c61a: am
5677513b: am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
b37768816cd9c530dcbb3a8f51d87536406a975b':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 20:00:08 +0000 (12:00 -0800)]
am
8b916936: am
2e582d13: am
9bce4032: am
08ee74b1: am
ea5586ef: am
4be7c61a: am
5677513b: am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
8b91693683895a8b148f6ffea8944cef2ba8d99b':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 19:55:10 +0000 (11:55 -0800)]
am
2e582d13: am
9bce4032: am
08ee74b1: am
ea5586ef: am
4be7c61a: am
5677513b: am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
2e582d1379fa78e2693269d76d2bcd763bfbfba1':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 19:44:37 +0000 (11:44 -0800)]
am
9bce4032: am
08ee74b1: am
ea5586ef: am
4be7c61a: am
5677513b: am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
9bce4032e9b3ea3433f7c75cbfb8d784b12392aa':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 19:40:21 +0000 (11:40 -0800)]
am
08ee74b1: am
ea5586ef: am
4be7c61a: am
5677513b: am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
08ee74b1f1c4df28faa4168114853836cc471095':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 19:38:01 +0000 (11:38 -0800)]
am
ea5586ef: am
4be7c61a: am
5677513b: am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
ea5586ef7fc29463f8144931c2c43261d15043b1':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 19:28:43 +0000 (11:28 -0800)]
am
4be7c61a: am
5677513b: am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
4be7c61a339f8200527f6df5a7b2215c96f81b4b':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 19:24:05 +0000 (11:24 -0800)]
am
5677513b: am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
5677513b7c46ca08a7fa34b9d227d7a448db6757':
Prevent authenticators from using Settings to launch arbitrary activities.
Carlos Valdivia [Thu, 27 Feb 2014 19:22:53 +0000 (11:22 -0800)]
am
9272db02: am
c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
9272db024d013fbb48ec476c77562ab31d75a461':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 19:20:24 +0000 (11:20 -0800)]
am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
da37ed8b0aebdf885a32cbe28e8fd5a2240d38c3':
Prevent authenticators from using Settings to launch arbitrary activities.
Carlos Valdivia [Thu, 27 Feb 2014 19:17:11 +0000 (11:17 -0800)]
am
c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
c45bd7f20987ed2fd29b9192edb38d02b4caa23b':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 19:16:49 +0000 (11:16 -0800)]
am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
b9ba0c6c43f0f7f0d5e347030e3c86a86ed74542':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Wed, 26 Feb 2014 23:42:34 +0000 (15:42 -0800)]
Prevent authenticators from using Settings to launch arbitrary activities.
Various authenticator results such as getAuthToken and addAccount might
result in an Intent returned to the AccountManager caller. A malicious
authenticator could exploit the fact that the Settings are a system app,
lead the user to launch add account for their account type and thus get
Settings to use the intent to start some arbitrary third parties Activity.
The fix is to make sure that the UID of the app associated with Activity
to be launched by the supplied intent and the Authenticators UID share
the same signature. This means that an authenticator implementer can only
exploit apps they control.
This is a backport of
5bab9daf3cf66f4de19f8757e386030e8bef23ce
Bug:
7699048
Change-Id: Ifed345c2fc20020d55fa2cab1f2f7ea509ea09b2
Carlos Valdivia [Sun, 29 Sep 2013 12:11:56 +0000 (05:11 -0700)]
Prevent authenticators from using Settings to launch arbitrary activities.
Various authenticator results such as getAuthToken and addAccount might
result in an Intent returned to the AccountManager caller. A malicious
authenticator could exploit the fact that the Settings are a system app,
lead the user to launch add account for their account type and thus get
Settings to use the intent to start some arbitrary third parties Activity.
The fix is to make sure that the UID of the app associated with Activity
to be launched by the supplied intent and the Authenticators UID share
the same signature. This means that an authenticator implementer can only
exploit apps they control.
Bug:
7699048
Change-Id: I34330454c341e6a8422ca1ed3b390466a0feedce
(cherry picked from commit
5bab9daf3cf66f4de19f8757e386030e8bef23ce)
Michael Wright [Wed, 26 Feb 2014 23:40:44 +0000 (15:40 -0800)]
Revert Japanese special case fallback keys.
Reverts commits
4567e40eb04589d211af82f2dcb16cb3955c605e and
a977707d6e7006d11cfde045f187e777b31b9e04, which added special case fallbacks
for game controllers in the Japanese locale.
Bug:
12923922
Change-Id: I229126e589e11fb5de86772ef9c59d09723af941
Robert Greenwalt [Tue, 25 Feb 2014 18:14:26 +0000 (18:14 +0000)]
am
1f9ebc5f: (-s ours) am
868d4c34: am
95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '
1f9ebc5fa73e7d324429a697cd10abb3761b1ff0':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Tue, 25 Feb 2014 18:12:35 +0000 (10:12 -0800)]
am
868d4c34: am
95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '
868d4c341034de6e2ebb6c1a247488b00d17c78d':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Tue, 25 Feb 2014 18:09:13 +0000 (10:09 -0800)]
am
95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '
950230663fb3a9af438ec2ee57605fc9e7a58428':
DO NOT MERGE Sanitize WifiConfigs
Mike Lockwood [Tue, 25 Feb 2014 15:35:33 +0000 (15:35 +0000)]
Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev
Robert Greenwalt [Fri, 7 Feb 2014 11:52:12 +0000 (03:52 -0800)]
DO NOT MERGE Sanitize WifiConfigs
Do this both on input from apps (giving error) and between wifi and
ConnectivityService (ignoring bad data). This means removing all
addresses beyond the first and all routes but the first default and
the implied direct-connect routes.
We do this because the user can't monitor the others (no UI), their
support wasn't intended, they allow redirection of all traffic
without user knowledge and they allow circumvention of legacy VPNs.
This should not move forward from JB as it breaks IPv6 and K has
a more resilient VPN.
Bug:
12663469
Change-Id: I0d92db7efc30a1bb3e5b8c6e5595bdb9793a16f2
Conflicts:
core/java/android/net/LinkProperties.java
services/java/com/android/server/WifiService.java
wifi/java/android/net/wifi/WifiStateMachine.java
rich cannings [Wed, 12 Feb 2014 21:24:25 +0000 (13:24 -0800)]
Make FORCE_STOP_PACKAGES "signature|system"
Bug:
12992556
Change-Id: Iebc91aabb67034e8a5ada7efdcdaaed4cc6d0f1b
(cherry picked from commit
4b7510cf842fdadf1b7e8e0495ded1b2bbd50d7e)
Baligh Uddin [Thu, 20 Feb 2014 18:31:02 +0000 (18:31 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 20 Feb 2014 18:30:49 +0000 (18:30 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 20 Feb 2014 17:59:40 +0000 (17:59 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 20 Feb 2014 17:55:32 +0000 (17:55 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 20 Feb 2014 17:55:23 +0000 (17:55 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 20 Feb 2014 17:55:13 +0000 (17:55 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Xavier Ducrohet [Thu, 20 Feb 2014 17:41:07 +0000 (17:41 +0000)]
Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev
Baligh Uddin [Thu, 20 Feb 2014 06:16:02 +0000 (22:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9accaa37043e730ad6ec4aa98901a48e0858b132
Auto-generated-cl: translation import
Baligh Uddin [Thu, 20 Feb 2014 06:08:21 +0000 (22:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0c823200179a75e0444f6e86ecc6813a6e662fa0
Auto-generated-cl: translation import
Baligh Uddin [Thu, 20 Feb 2014 03:42:43 +0000 (19:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: If9205c555286daf7dea68702d2da39752b59def4
Auto-generated-cl: translation import
Baligh Uddin [Thu, 20 Feb 2014 02:54:52 +0000 (18:54 -0800)]
Import translations. DO NOT MERGE
Change-Id: I31e5b7b7aa453a0455fd31eca6a11520730a26a7
Auto-generated-cl: translation import
Baligh Uddin [Thu, 20 Feb 2014 02:49:33 +0000 (18:49 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3003f43c32943496e855ba2744a7492232dbd56b
Auto-generated-cl: translation import
Baligh Uddin [Thu, 20 Feb 2014 02:45:30 +0000 (18:45 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3300523019b91cffd6f36d02434c521ab7368f37
Auto-generated-cl: translation import
Deepanshu Gupta [Wed, 19 Feb 2014 18:53:27 +0000 (10:53 -0800)]
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
For these font families, text was always rendered as italic. This
changeset fixes the issue.
Bug: http://b.android.com/57221
Change-Id: Ic8a299bd1e555f5bb914cd3d2fe72917ec7f471a
(cherry picked from commit
e327212adde1136807bbdf052e8cc3861f8a6aba)
Deepanshu Gupta [Wed, 19 Feb 2014 19:05:02 +0000 (11:05 -0800)]
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
If a style doesn't specify text style (normal/bold/italic/bold-italic)
then default to normal instead of throwing an error.
Bug: http://b.android.com/61358
Change-Id: I0138c73807a5ff6e4d938a99ece3044333110aa1
(cherry picked from commit
0acfb16dcd95468fe032204f54618e86becfd1eb)
Mike Lockwood [Wed, 19 Feb 2014 19:18:02 +0000 (11:18 -0800)]
UsbDeviceManager: Fix race condition entering USB accessory mode
When switching USB modes there are often spurious connect and disconnect events
that occur before reenumeration is complete. There is currently a 1000ms timer
to "debounce" the disconnect events. But with some USB accessories, this timeout
is not long enough, which results in an endless cycle of attempts to enter
USB accessory mode when the phone is connected.
To fix this, we now wait up to 10 seconds for the host to successfully configure
the device when entering USB accessory mode before giving up.
This is separate from the existing debounce timer, so the behavior of the
USB state change broadcasts are not affected.
Bug:
12877769
Change-Id: I7aa61f8a618546d749a7ddfc97bf103029a73d03
Deepanshu Gupta [Tue, 7 Jan 2014 19:58:44 +0000 (11:58 -0800)]
Improve text rendering and measurement.
1. Fix a bug where baseline of the run was modified while rendering
resulting in crooked text in some cases.
2. Use GlyphVector.getLogicalBounds() for text measurement which is more
accurate than getVisualBounds().
3. This change also optimizes text rendering by not computing the advances
for individual glyphs when not needed.
Change-Id: I66792c4d8f50eaf29afa70bccca1e6c812a3fa28
Deepanshu Gupta [Thu, 6 Feb 2014 02:06:02 +0000 (02:06 +0000)]
Merge "Add methods for Time_Delegate" into klp-dev
Deepanshu Gupta [Thu, 6 Feb 2014 02:05:42 +0000 (02:05 +0000)]
Merge "Optimize layout rendering in layoutlib" into klp-dev
Deepanshu Gupta [Thu, 6 Feb 2014 02:05:21 +0000 (02:05 +0000)]
Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev
Deepanshu Gupta [Thu, 6 Feb 2014 02:04:49 +0000 (02:04 +0000)]
Merge "Fix the measurement of text bounds." into klp-dev
Deepanshu Gupta [Thu, 6 Feb 2014 01:11:14 +0000 (17:11 -0800)]
Fix a bug in Nine Patch library.
The nine patches were not drawn correctly if they were not positioned at
the top left corner of the canvas.
Bug: http://b.android.com/29959
Change-Id: Icfed522ea07322a3ee9f3955067d3da26c4b0b5b
Deepanshu Gupta [Sat, 1 Feb 2014 03:03:48 +0000 (19:03 -0800)]
Add methods for Time_Delegate
Bug: http://b.android.com/65359
Change-Id: I7c2d09286d6bcd9899444aaa5a4a5a342e39d923
Deepanshu Gupta [Tue, 21 Jan 2014 01:02:37 +0000 (17:02 -0800)]
Optimize layout rendering in layoutlib
The height of a layout should be zero if it is assigned a layout_weight.
This way, the layout is measured only once and prevents spurious errors.
Bug: https://code.google.com/p/android/issues/detail?id=58398
Change-Id: If49a7480e5eb82cb86780e00f2f5b65ee053fc2a