OSDN Git Service
smain@google.com [Wed, 15 Oct 2014 23:14:12 +0000 (23:14 +0000)]
am
b3994c2e: am
e43bb6a9: am
075531ae: add the butterbar for L announce to Preview landing page
* commit '
b3994c2e58c7cebef8274ff6d801819a2b189183':
add the butterbar for L announce to Preview landing page
smain@google.com [Wed, 15 Oct 2014 23:14:07 +0000 (23:14 +0000)]
am
2912627e: am
6fbe299f: am
d8d20f52: update analytics event tracking calls to use new script bug:
16331906
* commit '
2912627e007b95cf4b16c9e52a3acbec0c8bae60':
update analytics event tracking calls to use new script bug:
16331906
Geoff Mendal [Wed, 15 Oct 2014 22:38:38 +0000 (22:38 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Wed, 15 Oct 2014 22:19:49 +0000 (15:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I77f88b9cd7716f3dc5e432f943d015860018858a
Auto-generated-cl: translation import
smain@google.com [Wed, 15 Oct 2014 19:12:05 +0000 (19:12 +0000)]
am
e43bb6a9: am
075531ae: add the butterbar for L announce to Preview landing page
* commit '
e43bb6a9ec8cd0841926e7df8cc738d5357814c1':
add the butterbar for L announce to Preview landing page
smain@google.com [Wed, 15 Oct 2014 19:11:43 +0000 (19:11 +0000)]
am
6fbe299f: am
d8d20f52: update analytics event tracking calls to use new script bug:
16331906
* commit '
6fbe299fa5bcc084cd69899afdc3c77767b7c1f5':
update analytics event tracking calls to use new script bug:
16331906
Nancy Chen [Wed, 15 Oct 2014 18:47:01 +0000 (18:47 +0000)]
Merge "Add API method to extract subscription ID from phone account (1/3)" into lmp-sprout-dev
Jim Miller [Wed, 15 Oct 2014 18:26:59 +0000 (18:26 +0000)]
am
e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev
* commit '
e7c325559d961f13c6df96803bca4747f41b27a4':
Add a checkbox option to 'require password to decrypt'
Jim Miller [Wed, 15 Oct 2014 18:21:50 +0000 (18:21 +0000)]
Merge "Add a checkbox option to 'require password to decrypt'" into lmp-dev
Amith Yamasani [Wed, 15 Oct 2014 17:49:19 +0000 (17:49 +0000)]
am
2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev
* commit '
2c3886cb3463ff39c1986c5b85eba79748dd8c24':
Fix admin policies in managed profiles
Amith Yamasani [Wed, 15 Oct 2014 17:44:23 +0000 (17:44 +0000)]
Merge "Fix admin policies in managed profiles" into lmp-dev
Amith Yamasani [Tue, 14 Oct 2014 23:06:13 +0000 (16:06 -0700)]
Fix admin policies in managed profiles
Some of the admin policies are throwing security exceptions in
a managed profile without being documented correctly and others
shouldn't be throwing security exceptions.
Changed setCameraDisabled() to not throw an exception. It now just
prevents work profile apps from using the camera.
Changed wipeData() to allow passing in ERASE_EXTERNAL_STORAGE. In
secondary users/profiles, this is just going to remove the user, so
the flag is harmless.
Updated documentation for setKeyguardDisabledFeatures() and resetPassword()
to indicate that they cannot be called in a managed profile.
Bug:
17987913
Change-Id: I8060be4c2d32bdd4edb46ce543551fabb9c8c983
Jeff Sharkey [Wed, 15 Oct 2014 16:53:09 +0000 (16:53 +0000)]
am
88a6ed54: Merge "Reduce PackageInstaller Binder memory pressure." into lmp-dev
* commit '
88a6ed5477eb6fa0453f9f29adef4c11b6eeade0':
Reduce PackageInstaller Binder memory pressure.
Jeff Sharkey [Wed, 15 Oct 2014 16:49:04 +0000 (16:49 +0000)]
Merge "Reduce PackageInstaller Binder memory pressure." into lmp-dev
Tony Hill [Wed, 15 Oct 2014 16:27:28 +0000 (16:27 +0000)]
am
8e029715: Do not show roaming icon for BT Mobile SIM camped on EE UK network
* commit '
8e0297155075f9772dd6e8b8194da074dca008f8':
Do not show roaming icon for BT Mobile SIM camped on EE UK network
Jeff Sharkey [Wed, 15 Oct 2014 16:19:47 +0000 (09:19 -0700)]
Reduce PackageInstaller Binder memory pressure.
When restoring hundreds of apps on low-DPI devices, we end up sending
icon Bitmaps inline in the response instead of splitting into ashmem
regions. To avoid triggering TransactionTooLargeException, switch to
using ParceledListSlice under the hood.
Bug:
17926122
Change-Id: Ib4da6775e79d2fcb4aaea15f58ed998df203a5f9
Tony Hill [Tue, 14 Oct 2014 14:45:39 +0000 (15:45 +0100)]
Do not show roaming icon for BT Mobile SIM camped on EE UK network
Bug:
17986042
Change-Id: Ia9802c12363bbe6e93cf0b2e524351b6a3f4871c
Jinsuk Kim [Wed, 15 Oct 2014 05:16:12 +0000 (05:16 +0000)]
am
5873c3e8: Merge "DO NOT MERGE CEC: Queue actions for starting later when not ready" into lmp-dev
* commit '
5873c3e862b83fb0c64b52b86bdd8f26ff8ffb5f':
DO NOT MERGE CEC: Queue actions for starting later when not ready
Jinsuk Kim [Wed, 15 Oct 2014 05:10:58 +0000 (05:10 +0000)]
Merge "DO NOT MERGE CEC: Queue actions for starting later when not ready" into lmp-dev
smain@google.com [Wed, 15 Oct 2014 03:36:11 +0000 (03:36 +0000)]
am
075531ae: add the butterbar for L announce to Preview landing page
* commit '
075531ae190dd6e64d3a53991a209a624cb0ec63':
add the butterbar for L announce to Preview landing page
smain@google.com [Wed, 15 Oct 2014 02:34:43 +0000 (19:34 -0700)]
add the butterbar for L announce to Preview landing page
Change-Id: Id84a5a62153281b3daaefc287450d392ecb51bbc
smain@google.com [Wed, 15 Oct 2014 02:15:35 +0000 (02:15 +0000)]
am
d8d20f52: update analytics event tracking calls to use new script bug:
16331906
* commit '
d8d20f52ec0550477b773cee4c0f0343f2a9301f':
update analytics event tracking calls to use new script bug:
16331906
Jeff Sharkey [Wed, 15 Oct 2014 02:05:56 +0000 (02:05 +0000)]
am
97978808: Start cross profile intents as caller.
* commit '
9797880808320e3a7bae1f59bc7e0c5a13189e5f':
Start cross profile intents as caller.
smain@google.com [Wed, 8 Oct 2014 23:53:42 +0000 (16:53 -0700)]
update analytics event tracking calls to use new script
bug:
16331906
Change-Id: I4cd8f08509cfb887a424696553404ba3c635151b
Jeff Sharkey [Tue, 14 Oct 2014 17:48:18 +0000 (10:48 -0700)]
Start cross profile intents as caller.
The system should always be using new startActivityAsCaller() when
starting activities on behalf of someone else, to ensure that
security checks are enforced as the original caller.
Bug:
17983737
Change-Id: Ic40816a797cfdb13c0adb48b86ed4ed7d6aae8eb
Svetoslav [Wed, 15 Oct 2014 00:07:27 +0000 (00:07 +0000)]
am
dc876b56: Merge "Fix a NPE in device policy manager service." into lmp-dev
* commit '
dc876b56217c588596661ca514b4bdb8a6cfe843':
Fix a NPE in device policy manager service.
Svetoslav [Wed, 15 Oct 2014 00:02:58 +0000 (00:02 +0000)]
Merge "Fix a NPE in device policy manager service." into lmp-dev
Jinsuk Kim [Fri, 10 Oct 2014 05:40:29 +0000 (14:40 +0900)]
DO NOT MERGE CEC: Queue actions for starting later when not ready
Requests coming in while the service is still being brought up
were discarded. Changed to queue them so that they can be started
after the initialization is completed.
Bug:
17985588
Change-Id: Ic9d9cd2094b830c80dec54dd5ef6a18159a74dc7
Conflicts:
services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
Craig Mautner [Tue, 14 Oct 2014 23:41:26 +0000 (23:41 +0000)]
am
ea496644: Merge "Add null check" into lmp-dev
* commit '
ea4966442cd035e592aa73c0c29225efe3f091fb':
Add null check
Craig Mautner [Tue, 14 Oct 2014 23:35:31 +0000 (23:35 +0000)]
Merge "Add null check" into lmp-dev
Jim Miller [Tue, 14 Oct 2014 01:51:53 +0000 (18:51 -0700)]
Add a checkbox option to 'require password to decrypt'
Fixes bug
17881324
Change-Id: Id94e593a172d686339c736473226fece1bb749ee
Craig Mautner [Tue, 14 Oct 2014 23:17:06 +0000 (16:17 -0700)]
Add null check
Unable to examine bugreports that die in the middle of dump().
Help for bug
17721767.
Change-Id: I31a5e03acf67c926a1cbfefe2a7ea7fca3b71b06
Svetoslav [Tue, 14 Oct 2014 22:53:14 +0000 (15:53 -0700)]
Fix a NPE in device policy manager service.
It is possible that the device does not have an owner. If there
is no owner we get a NPE when asking the device policy manager
for cross-profile widget providers.
bug:
17989189
Change-Id: I5759f2dec160ed8076ab47fdf09134f78c57458d
Jason Monk [Tue, 14 Oct 2014 22:47:21 +0000 (22:47 +0000)]
am
f97e71a6: Merge "Update screen pinning and recents strings to say Overview" into lmp-dev
* commit '
f97e71a6ddbaea2ffcba9f528e8cb43ee2ada40a':
Update screen pinning and recents strings to say Overview
Jason Monk [Tue, 14 Oct 2014 22:42:52 +0000 (22:42 +0000)]
Merge "Update screen pinning and recents strings to say Overview" into lmp-dev
Selim Cinek [Tue, 14 Oct 2014 22:31:27 +0000 (22:31 +0000)]
am
cedb6dc7: Merge "Fixed a bug when double tapping a notification in the normal shade" into lmp-dev
* commit '
cedb6dc7f2e19120d6889bc681d143bfb2891b80':
Fixed a bug when double tapping a notification in the normal shade
Ricardo Cervera-Navarro [Tue, 14 Oct 2014 22:31:21 +0000 (22:31 +0000)]
am
a4f9c087: am
c93723bd: am
7668aa27: am
aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs
* commit '
a4f9c0873f1d414d6721989f44d88de9a1f6d01a':
Revert "docs: Watermarked images for codes that weren't found."
Jeff Hao [Tue, 14 Oct 2014 22:31:16 +0000 (22:31 +0000)]
am
dbfbb175: Backport of ordering apps for boot dexopt.
* commit '
dbfbb17512fe6a5b3c7198d60b6a149969174a71':
Backport of ordering apps for boot dexopt.
Selim Cinek [Tue, 14 Oct 2014 22:28:24 +0000 (22:28 +0000)]
Merge "Fixed a bug when double tapping a notification in the normal shade" into lmp-dev
Ricardo Cervera-Navarro [Tue, 14 Oct 2014 22:27:21 +0000 (22:27 +0000)]
am
c93723bd: am
7668aa27: am
aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs
* commit '
c93723bdf9b2ce4dc0426817b8bec924d9f97a79':
Revert "docs: Watermarked images for codes that weren't found."
Ricardo Cervera-Navarro [Tue, 14 Oct 2014 22:20:02 +0000 (22:20 +0000)]
am
7668aa27: am
aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs
* commit '
7668aa27999e5650fe8776853565f792311fb57d':
Revert "docs: Watermarked images for codes that weren't found."
Svetoslav [Tue, 14 Oct 2014 22:15:26 +0000 (22:15 +0000)]
am
0a1ffdb3: Merge "Handle if the printing app is killed while saving to PDF." into lmp-dev
* commit '
0a1ffdb3f89705eeeb89349fcd31c82b2d15b0a5':
Handle if the printing app is killed while saving to PDF.
Ricardo Cervera-Navarro [Tue, 14 Oct 2014 22:14:16 +0000 (22:14 +0000)]
am
aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs
* commit '
aa7bcf140d95049f1482c896b770de7ba339f7c9':
Revert "docs: Watermarked images for codes that weren't found."
Jeff Hao [Tue, 30 Sep 2014 21:41:31 +0000 (14:41 -0700)]
Backport of ordering apps for boot dexopt.
This is a squashed commit of the following changes:
1. Order apps by priority when performing boot dexopt.
(cherry picked from commit
65cde7d42d741c7d9aa2714a397b7333f688ab55)
2. Improve priority ordering of apps when performing boot dexopt.
Added core apps and updated system apps.
(cherry picked from commit
272bf3a274daff62995caf05da338c1f2a73dae3)
3. Stop boot dexopt when low on memory.
(cherry picked from commit
1d892dcb6b0ff3a50cc63e387667dc29baf1014f)
Bug:
17641843
Change-Id: Ie32f1c21047d3462aaf728f7633fecf647ba2b47
Ricardo Cervera-Navarro [Tue, 14 Oct 2014 21:59:47 +0000 (21:59 +0000)]
Merge "Revert "docs: Watermarked images for codes that weren't found."" into klp-docs
Svetoslav [Tue, 14 Oct 2014 21:56:30 +0000 (21:56 +0000)]
Merge "Handle if the printing app is killed while saving to PDF." into lmp-dev
Svetoslav [Tue, 14 Oct 2014 21:14:49 +0000 (14:14 -0700)]
Handle if the printing app is killed while saving to PDF.
When saving to PDF we bring up the file picker UI which covers
the print UI. In this case the printing app may get killed as
it is not in the forground (the system is bound to the print
spooler so it cannot get killed). If that happens we are ending
up with an empty file. However, if the file chooser UI is up
we already have everything from the app we need and it dying
does not matter. This change takes care if ignoring printing
app death while saving to PDF.
bug:
17922948
Change-Id: I10d808e3c3e93e850dbc2a948f2482381a887928
Filip Gruszczynski [Tue, 14 Oct 2014 20:59:57 +0000 (20:59 +0000)]
Merge "Prevent index out of bounds when using String.substring." into lmp-sprout-dev
Amith Yamasani [Tue, 14 Oct 2014 19:57:46 +0000 (19:57 +0000)]
am
15a5f82f: Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev
* commit '
15a5f82f9b6b389614b1df78749bd627d97d5417':
Hide DISALLOW_OUTGOING_BEAM API
Amith Yamasani [Tue, 14 Oct 2014 19:51:14 +0000 (19:51 +0000)]
Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev
Filip Gruszczynski [Tue, 14 Oct 2014 19:06:06 +0000 (12:06 -0700)]
Prevent index out of bounds when using String.substring.
Change-Id: Ib30f9646e9895b6a2f065a0b2e51cf53e821b087
Dianne Hackborn [Tue, 14 Oct 2014 19:21:18 +0000 (19:21 +0000)]
am
35de0e28: Merge "Fix issue #
10034864: Define YouTube application as the preferred..." into lmp-dev
* commit '
35de0e2872b64f78b596a850d6da2c483ba65bb5':
Fix issue #
10034864: Define YouTube application as the preferred...
Dianne Hackborn [Tue, 14 Oct 2014 19:16:21 +0000 (19:16 +0000)]
Merge "Fix issue #
10034864: Define YouTube application as the preferred..." into lmp-dev
Jason Monk [Tue, 14 Oct 2014 13:26:19 +0000 (09:26 -0400)]
Update screen pinning and recents strings to say Overview
Bug:
17969466
Bug:
17970142
Change-Id: I76cd934ea6d67f36609fdc53ca1d195fcb7dcfbe
Filip Gruszczynski [Tue, 14 Oct 2014 18:08:33 +0000 (18:08 +0000)]
Merge "Log wallpaper crashes." into lmp-sprout-dev
Rich Slogar [Tue, 14 Oct 2014 17:52:54 +0000 (17:52 +0000)]
am
a89ac60e: am
858cfad9: am
a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs
* commit '
a89ac60e25eb77b4c605fc1a40c96416b199bea5':
docs:SDK tools 23.0.5 Release Note
Nick Kralevich [Tue, 14 Oct 2014 17:52:04 +0000 (17:52 +0000)]
am
0ae82b05: resolved conflicts for merge of
a4eb81b6 to lmp-dev
* commit '
0ae82b05be47df85551a1c759a93e84c8009947c':
Docs: adding closing bracket to un-break javadoc tokens.
Dianne Hackborn [Tue, 14 Oct 2014 17:43:43 +0000 (10:43 -0700)]
Fix issue #
10034864: Define YouTube application as the preferred...
...handler for its Intents
Fix bug when a third party app is installed as an additional but
worse match for the intent.
Also raise up the limit for when we start printing logs about
overly large strict mode data.
And turn off the logs about services being created and destroyed,
since with the way things are using services these days these have
become way too spammy.
Change-Id: I8fe301dfd80fb4b70213cb7783b7c5426245278d
Amith Yamasani [Tue, 14 Oct 2014 16:27:20 +0000 (09:27 -0700)]
Hide DISALLOW_OUTGOING_BEAM API
This is not fully functional in managed profiles, so it is being removed for L.
Bug:
17973040
Change-Id: If660e5e565076cdf61649e9f5ca12877425e9df3
Rich Slogar [Tue, 14 Oct 2014 15:55:37 +0000 (15:55 +0000)]
am
858cfad9: am
a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs
* commit '
858cfad9482817305cc5b846102c3f8e5d12782a':
docs:SDK tools 23.0.5 Release Note
Ricardo Cervera-Navarro [Tue, 14 Oct 2014 15:49:07 +0000 (15:49 +0000)]
Revert "docs: Watermarked images for codes that weren't found."
Remove easter eggs.
This reverts commit
453df8e6e33f30808ea2244eaa1dd32169996129.
Change-Id: Iaa8c815a876d163c35cc83f3cf4899dd426def7b
Nick Kralevich [Tue, 14 Oct 2014 15:38:05 +0000 (08:38 -0700)]
resolved conflicts for merge of
a4eb81b6 to lmp-dev
Change-Id: I73b225141e09826b40e4941140b59d1c163bd9c7
Selim Cinek [Tue, 14 Oct 2014 13:46:43 +0000 (15:46 +0200)]
Fixed a bug when double tapping a notification in the normal shade
This fixes that sometimes holes where created when grabbing the panel while
closing the shade (eg. double tapping) or the notifications did not disappear.
It could also happen when using the clear all button.
Bug:
17969040
Bug:
17899136
Bug:
17961295
Bug:
17551216
Change-Id: Id7aa37bbcbae504039f90686e2bc364d18685205
Wei Wang [Mon, 13 Oct 2014 23:02:29 +0000 (23:02 +0000)]
Merge "Add support of advertising through standard instance.(1/4)" into lmp-sprout-dev
Filip Gruszczynski [Mon, 13 Oct 2014 22:51:39 +0000 (15:51 -0700)]
Log wallpaper crashes.
Change-Id: I40d9876dad2a8ec98135e3df127950dc3797040b
Evan Charlton [Mon, 13 Oct 2014 22:28:29 +0000 (22:28 +0000)]
am
f715da3d: Merge "Update the SDK AIDL list" into lmp-dev
* commit '
f715da3d6b2c2d5037de69262eba513e863a98d8':
Update the SDK AIDL list
Evan Charlton [Mon, 13 Oct 2014 22:19:39 +0000 (22:19 +0000)]
Merge "Update the SDK AIDL list" into lmp-dev
Evan Charlton [Sun, 12 Oct 2014 16:54:30 +0000 (09:54 -0700)]
Update the SDK AIDL list
Populate the framework.aidl list with .aidl files which are:
- In the android.* namespace
- Not marked @hide
- Do not have their corresponding .java files marked @hide
Bug:
17952409
Change-Id: I1f4abf7abbc298a51605571cd168362dcc5603b2
Sarah Maddox [Mon, 13 Oct 2014 22:04:22 +0000 (22:04 +0000)]
am
8601b1b1: Merge "Fixed a typo in Perf Tips." into lmp-dev
* commit '
8601b1b1ca75512177aa3539d33292250b5c9a2d':
Fixed a typo in Perf Tips.
Alan Viverette [Mon, 13 Oct 2014 22:04:15 +0000 (22:04 +0000)]
am
b927dfc7: Merge "Increase contrast for money permission" into lmp-dev
* commit '
b927dfc774bd9d2c52cf6fbf50fe2eca16994c27':
Increase contrast for money permission
Elliott Hughes [Mon, 13 Oct 2014 22:04:11 +0000 (22:04 +0000)]
am
c130b428: Merge "Ensure that the SIM language doesn\'t override the user language on the encryption UI." into lmp-dev
* commit '
c130b428c5d7eb25dc7651c5cea82182f2241ddf':
Ensure that the SIM language doesn't override the user language on the encryption UI.
Jeff Sharkey [Mon, 13 Oct 2014 22:04:06 +0000 (22:04 +0000)]
am
461b3896: Merge "DocumentsUI: Add content description for nav." into lmp-dev
* commit '
461b3896babdbfb365282378df89cde2dddb5a3a':
DocumentsUI: Add content description for nav.
Jesse Hall [Mon, 13 Oct 2014 22:03:59 +0000 (22:03 +0000)]
am
647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev
* commit '
647e0df0c711cd53763367c86b15f10470eaeb6f':
Surface: Leave object in unlocked state when unlockCanvasAndPost fails
Amit Mahajan [Mon, 13 Oct 2014 22:03:52 +0000 (22:03 +0000)]
am
1901e175: Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev
* commit '
1901e175079e3b7242ace7d4b3ec38af3723f91b':
Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem.
Sarah Maddox [Mon, 13 Oct 2014 21:50:28 +0000 (21:50 +0000)]
Merge "Fixed a typo in Perf Tips." into lmp-dev
Alan Viverette [Mon, 13 Oct 2014 21:31:39 +0000 (21:31 +0000)]
Merge "Increase contrast for money permission" into lmp-dev
Nancy Chen [Thu, 9 Oct 2014 01:47:40 +0000 (18:47 -0700)]
Add API method to extract subscription ID from phone account (1/3)
Since Telephony uses subscription ids and Telecom uses Phone Accounts,
there should be an easy way to interface between the two. Since the
value of the subscription id and "id" of the phone account should be the
same in the case of a SIM phone account, we just need to check that the
phone account in question is a SIM phone account and convert the string
to a long.
This lays in groundwork for the following bugs:
Bug:
17925501
Bug:
17917937
Change-Id: I926e969b365d9e9878436302117e8786ec5513b8
Elliott Hughes [Mon, 13 Oct 2014 20:55:29 +0000 (20:55 +0000)]
Merge "Ensure that the SIM language doesn't override the user language on the encryption UI." into lmp-dev
Jeff Sharkey [Mon, 13 Oct 2014 20:31:02 +0000 (20:31 +0000)]
Merge "DocumentsUI: Add content description for nav." into lmp-dev
Jesse Hall [Mon, 13 Oct 2014 20:23:14 +0000 (20:23 +0000)]
Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev
Alan Viverette [Mon, 13 Oct 2014 20:12:49 +0000 (13:12 -0700)]
Increase contrast for money permission
BUG:
17923303
Change-Id: Ic35a9d37690ec5c4375285ca9b162cbff62db656
Jeff Sharkey [Mon, 13 Oct 2014 19:53:13 +0000 (12:53 -0700)]
DocumentsUI: Add content description for nav.
Bug:
17922955
Change-Id: I44c0107d8dd03aab36da55deeb864e328b492124
Elliott Hughes [Mon, 13 Oct 2014 19:39:56 +0000 (12:39 -0700)]
Ensure that the SIM language doesn't override the user language on the encryption UI.
Bug:
17945169
Change-Id: I51e4f47c7cd925f3701f292b9022e467ccf95a17
Amit Mahajan [Mon, 13 Oct 2014 19:32:36 +0000 (19:32 +0000)]
Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev
Yohei Yukawa [Mon, 13 Oct 2014 18:48:16 +0000 (18:48 +0000)]
am
2dfd8d57: Merge "Update config when "Show input method" is changed" into lmp-dev
* commit '
2dfd8d578a0c5b90ee10ce1f3ddb4aeb0e948f60':
Update config when "Show input method" is changed
Mike Lockwood [Mon, 13 Oct 2014 18:48:11 +0000 (18:48 +0000)]
am
317f9ce8: Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or system" into lmp-dev
* commit '
317f9ce85a492a213b8f1dac477b1aefad55f621':
Change RECEIVE_BLUETOOTH_MAP permission to signature or system
Michael Wright [Mon, 13 Oct 2014 18:48:07 +0000 (18:48 +0000)]
am
265d3e9d: Merge "Clean-up ColorFade\'s shaders and buffers." into lmp-dev
* commit '
265d3e9d3eb6915d9ca9da5fcd1ddb29b5f8bc3b':
Clean-up ColorFade's shaders and buffers.
Geoff Mendal [Mon, 13 Oct 2014 18:48:03 +0000 (18:48 +0000)]
am
02c4a225: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
02c4a225ffa32e67255517a0275d7a4c1a738619':
Import translations. DO NOT MERGE
Yohei Yukawa [Mon, 13 Oct 2014 18:42:48 +0000 (18:42 +0000)]
Merge "Update config when "Show input method" is changed" into lmp-dev
Mike Lockwood [Mon, 13 Oct 2014 18:38:22 +0000 (18:38 +0000)]
Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or system" into lmp-dev
Amit Mahajan [Mon, 13 Oct 2014 18:21:46 +0000 (11:21 -0700)]
Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to
signatureOrSystem.
Bug:
17952946
Change-Id: I4a75da11cb092ca795d0eacf824890eb12c7446a
Jesse Hall [Mon, 13 Oct 2014 18:01:15 +0000 (11:01 -0700)]
Surface: Leave object in unlocked state when unlockCanvasAndPost fails
If nativeUnlockCanvasAndPost() throws, Surface was maintaining a
reference to the native Surface, and assuming it was still locked.
That would cause future lockCanvas() calls to throw without even
trying to lock the native Surface, even though in some cases the
native lock was actually released before the exception was thrown.
Now Surface treats the native object as unlocked even if
nativeUnlockCanvasAndPost() throws, so it will attempt the native lock
on lockCanvas() rather than assuming it would fail.
This change also changes an IllegalStateException to
IllegalArgumentException in unlockCanvasAndPost(). That exception was
added in KitKat, and was never documented or added to the throws
declaration. This was essentially a silent public API change. Quite a
bit of code in the framework (and likely in applications) catches
IAE from this method, but didn't attempt to handle ISE. Although ISE
is more correct here, it's not worth breaking code (and it did -- in
this bug it changed a problem that should have been silently and
perfectly recovered from into a fatal exception in system_server.)
Bug:
17684556
Change-Id: Ia8d3e5d33eaa690d16c7d0f557390c7bb4e1e32e
Geoff Mendal [Mon, 13 Oct 2014 17:31:33 +0000 (17:31 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Michael Wright [Mon, 13 Oct 2014 17:30:31 +0000 (17:30 +0000)]
Merge "Clean-up ColorFade's shaders and buffers." into lmp-dev
Geoff Mendal [Mon, 13 Oct 2014 17:22:35 +0000 (17:22 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Geoff Mendal [Mon, 13 Oct 2014 17:15:50 +0000 (10:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I089e715e2d5e9c3533ddfbcd9a8773e5d4badd86
Auto-generated-cl: translation import
Geoff Mendal [Mon, 13 Oct 2014 17:05:28 +0000 (10:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0248efd41328adc6acd19fb84131fc4d7606b774
Auto-generated-cl: translation import
Mike Lockwood [Mon, 13 Oct 2014 17:00:08 +0000 (10:00 -0700)]
Change RECEIVE_BLUETOOTH_MAP permission to signature or system
Bug:
17954105
Change-Id: I8b16cab7193c97e5f54d6e4ef33ebf8cda0da197
Geoff Mendal [Mon, 13 Oct 2014 14:17:22 +0000 (14:17 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 13 Oct 2014 14:16:34 +0000 (07:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iefa534c5aef2a7e43adf030b844d91a64bd90976
Auto-generated-cl: translation import