OSDN Git Service
Robert Greenwalt [Wed, 19 Mar 2014 19:13:00 +0000 (19:13 +0000)]
am
42b746e4: am
bd84f01c: am
5d3d4ee3: Merge "Handle provisioning APN by turning off/on data." into klp-dev
* commit '
42b746e4d8baa6141598ddaae7148baea2ddf366':
Handle provisioning APN by turning off/on data.
Robert Greenwalt [Wed, 19 Mar 2014 19:08:44 +0000 (19:08 +0000)]
am
bd84f01c: am
5d3d4ee3: Merge "Handle provisioning APN by turning off/on data." into klp-dev
* commit '
bd84f01c6ce122ab58fc7c5b687dc8bfb0fb03e6':
Handle provisioning APN by turning off/on data.
Dan Sandler [Wed, 19 Mar 2014 19:07:41 +0000 (19:07 +0000)]
am
48b3f56c: Merge commit \'
95a7829c\' into manualmerge
* commit '
48b3f56cd8a3597e6ecfc5ad55d20eca182a6852':
DO NOT MERGE: Maintain binding to crashed listeners.
Robert Greenwalt [Wed, 19 Mar 2014 16:15:22 +0000 (16:15 +0000)]
am
5d3d4ee3: Merge "Handle provisioning APN by turning off/on data." into klp-dev
* commit '
5d3d4ee3005e910dce780074d3f68d594aa12070':
Handle provisioning APN by turning off/on data.
Robert Greenwalt [Wed, 19 Mar 2014 16:12:01 +0000 (16:12 +0000)]
Merge "Handle provisioning APN by turning off/on data." into klp-dev
Dan Sandler [Wed, 19 Mar 2014 16:02:51 +0000 (12:02 -0400)]
Merge commit '
95a7829c' into manualmerge
Dan Sandler [Wed, 19 Mar 2014 13:08:53 +0000 (13:08 +0000)]
am
b78dc69c: Merge "DO NOT MERGE: Maintain binding to crashed listeners." into klp-dev
* commit '
b78dc69c2be43852dcd7150db2b545f9b4110232':
DO NOT MERGE: Maintain binding to crashed listeners.
Dan Sandler [Wed, 19 Mar 2014 13:04:00 +0000 (13:04 +0000)]
Merge "DO NOT MERGE: Maintain binding to crashed listeners." into klp-dev
Dave Platt [Wed, 19 Mar 2014 01:07:46 +0000 (01:07 +0000)]
am
c76bccd6: am
17e7c407: am
98a027a5: Merge "Harden NsdManager against null-dereference crashes" into klp-dev
* commit '
c76bccd6ea993eb6e71baff9f5ed2f9fe67af947':
Harden NsdManager against null-dereference crashes
Jeff Brown [Wed, 19 Mar 2014 01:00:06 +0000 (01:00 +0000)]
am
1eac8391: am
c9a7eeba: am
4cb1bc28: Merge "Refresh cast icon assets to improve visual contrast." into klp-dev
* commit '
1eac839165b05d4998ca344a25594b0a1cfae042':
Refresh cast icon assets to improve visual contrast.
Dave Platt [Wed, 19 Mar 2014 00:59:47 +0000 (00:59 +0000)]
am
17e7c407: am
98a027a5: Merge "Harden NsdManager against null-dereference crashes" into klp-dev
* commit '
17e7c4076b8f1617ed397dae570e9d5240cd9c1b':
Harden NsdManager against null-dereference crashes
Jeff Brown [Wed, 19 Mar 2014 00:55:39 +0000 (00:55 +0000)]
am
c9a7eeba: am
4cb1bc28: Merge "Refresh cast icon assets to improve visual contrast." into klp-dev
* commit '
c9a7eeba15641da5a5bc8499e813e6c2211506ff':
Refresh cast icon assets to improve visual contrast.
Dave Platt [Wed, 19 Mar 2014 00:54:54 +0000 (00:54 +0000)]
am
98a027a5: Merge "Harden NsdManager against null-dereference crashes" into klp-dev
* commit '
98a027a506b5acff1a7ab0cc3655399da7d025c7':
Harden NsdManager against null-dereference crashes
Dave Platt [Wed, 19 Mar 2014 00:50:29 +0000 (00:50 +0000)]
Merge "Harden NsdManager against null-dereference crashes" into klp-dev
Jeff Brown [Wed, 19 Mar 2014 00:25:41 +0000 (00:25 +0000)]
am
4cb1bc28: Merge "Refresh cast icon assets to improve visual contrast." into klp-dev
* commit '
4cb1bc2877f8562e6d349a6c737a3055ef4eaa29':
Refresh cast icon assets to improve visual contrast.
Jeff Brown [Wed, 19 Mar 2014 00:19:38 +0000 (00:19 +0000)]
Merge "Refresh cast icon assets to improve visual contrast." into klp-dev
Xia Wang [Tue, 18 Mar 2014 22:34:17 +0000 (22:34 +0000)]
am
560e7541: am
1b007565: am
9b650702: Merge "Fix state transition verification." into klp-dev
* commit '
560e75417252b502a41967aa4d819a029361e384':
Fix state transition verification.
Xia Wang [Tue, 18 Mar 2014 22:22:37 +0000 (22:22 +0000)]
am
1b007565: am
9b650702: Merge "Fix state transition verification." into klp-dev
* commit '
1b007565c73097728496f3dbe811a51c879ba89e':
Fix state transition verification.
Xia Wang [Tue, 18 Mar 2014 22:16:26 +0000 (22:16 +0000)]
am
9b650702: Merge "Fix state transition verification." into klp-dev
* commit '
9b650702113f8a17e09940c3802de71a9fc62ff1':
Fix state transition verification.
Xia Wang [Tue, 18 Mar 2014 22:10:32 +0000 (22:10 +0000)]
Merge "Fix state transition verification." into klp-dev
Adrian Roos [Tue, 18 Mar 2014 21:51:44 +0000 (21:51 +0000)]
am
2d70a47b: am
a4a1c0d4: am
ac275cb3: am
1f3186ee: (-s ours) am
67a92975: am
88da2bfa: am
ed529a5a: (-s ours) am
500ec9ce: am
25fb7133: am
0b2f2122: am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
2d70a47b0e7196a58561195fc47a57085cf29633':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 21:47:18 +0000 (21:47 +0000)]
am
a4a1c0d4: am
ac275cb3: am
1f3186ee: (-s ours) am
67a92975: am
88da2bfa: am
ed529a5a: (-s ours) am
500ec9ce: am
25fb7133: am
0b2f2122: am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
a4a1c0d4ee66f85376adbd71800e05b88b60c5b7':
DO NOT MERGE - Fix keyguard pattern lockout bug
Jeff Brown [Tue, 18 Mar 2014 20:41:31 +0000 (13:41 -0700)]
Refresh cast icon assets to improve visual contrast.
Bug:
13473719
Change-Id: Ia82b2bc487a612f24bbe47f7d6e9182e862bcefa
Adrian Roos [Tue, 18 Mar 2014 21:07:28 +0000 (21:07 +0000)]
am
ac275cb3: am
1f3186ee: (-s ours) am
67a92975: am
88da2bfa: am
ed529a5a: (-s ours) am
500ec9ce: am
25fb7133: am
0b2f2122: am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
ac275cb3d8184e83228899280bb8901e30f3a5f2':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 21:03:15 +0000 (21:03 +0000)]
am
1f3186ee: (-s ours) am
67a92975: am
88da2bfa: am
ed529a5a: (-s ours) am
500ec9ce: am
25fb7133: am
0b2f2122: am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
1f3186ee4505997ef3a235f669313236099308f4':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:59:28 +0000 (13:59 -0700)]
am
67a92975: am
88da2bfa: am
ed529a5a: (-s ours) am
500ec9ce: am
25fb7133: am
0b2f2122: am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
67a92975ac638db3d51ea4978cf78ee207fcceb7':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:53:17 +0000 (13:53 -0700)]
am
88da2bfa: am
ed529a5a: (-s ours) am
500ec9ce: am
25fb7133: am
0b2f2122: am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
88da2bfaacaafebdd2e0fb9542386486b9594871':
DO NOT MERGE - Fix keyguard pattern lockout bug
Doug Zongker [Tue, 18 Mar 2014 20:49:12 +0000 (20:49 +0000)]
am
cdf00888: add option to shutdown after factory reset
* commit '
cdf008883921c2eb7daf10c82687e9a36461eb16':
add option to shutdown after factory reset
Adrian Roos [Tue, 18 Mar 2014 20:47:58 +0000 (13:47 -0700)]
am
ed529a5a: (-s ours) am
500ec9ce: am
25fb7133: am
0b2f2122: am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
ed529a5a78ade4833a8fd2ddfaf88d68ca260e6b':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:41:20 +0000 (13:41 -0700)]
am
500ec9ce: am
25fb7133: am
0b2f2122: am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
500ec9ce4b7856eca480c4c7dca8df1211614102':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:34:05 +0000 (13:34 -0700)]
am
25fb7133: am
0b2f2122: am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
25fb7133901f6a538d5d365f3c0c1c936e76679d':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:28:17 +0000 (13:28 -0700)]
am
0b2f2122: am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
0b2f212204bd71700a4a32b87ac2d4c6a0c56feb':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:24:35 +0000 (13:24 -0700)]
am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
d3da8f711ec642322e497a493985bed5c43f597b':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:17:12 +0000 (13:17 -0700)]
am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
ecba937b005b07d72eadfaf93a200e0b14af2980':
DO NOT MERGE - Fix keyguard pattern lockout bug
Doug Zongker [Tue, 18 Mar 2014 19:52:04 +0000 (12:52 -0700)]
add option to shutdown after factory reset
Add a new hidden method to recovery system to trigger a factory reset
followed by a shutdown, rather than a reboot back to the regular
system. Use this flag when the MASTER_CLEAR intent is broadcast with
a boolean extra "shutdown" set to true.
Change-Id: I2ceb25b715d9f0ef492a75b3d287d1e17cec89ef
Dianne Hackborn [Tue, 18 Mar 2014 18:36:53 +0000 (18:36 +0000)]
am
d1d91eca: am
7cb1dfe6: Merge "Insufficient ProcessRecord cleanup when persistent process is killed"
* commit '
d1d91eca3e78f2074b110a0e3530aeff6deef6fe':
Insufficient ProcessRecord cleanup when persistent process is killed
Dianne Hackborn [Tue, 18 Mar 2014 18:31:34 +0000 (11:31 -0700)]
am
7cb1dfe6: Merge "Insufficient ProcessRecord cleanup when persistent process is killed"
* commit '
7cb1dfe690b2d700ce212712287dfd59c2c8e43f':
Insufficient ProcessRecord cleanup when persistent process is killed
Dianne Hackborn [Tue, 18 Mar 2014 18:28:16 +0000 (18:28 +0000)]
Merge "Insufficient ProcessRecord cleanup when persistent process is killed"
Xia Wang [Tue, 4 Mar 2014 19:29:18 +0000 (11:29 -0800)]
Fix state transition verification.
When there is connectivity state change, the network states could be broadcasted multiple times.
The state transition should consider that.
Bug:
13277256
Change-Id: I3d400900a0e2454f9d198629f1c062cbb15bdcd8
(cherry picked from commit
71aae0b6fd1bb9204b81c2e9447f3544c29579c4)
Wink Saville [Thu, 13 Mar 2014 13:54:59 +0000 (06:54 -0700)]
Handle provisioning APN by turning off/on data.
This is a start and two tests succeed:
Tested expired AT&T SIM and waiting 15min for alarm to fire.
Tested a provisioned Verizon SIM and works normally.
I've NOT tested AT&T where I've properly completed the provisioning.
I've NOT tested T-Mobile SIM either provisioned or not-provisioned.
I've NOT tested provisioning over WiFi.
I've NOT tested that WiFi <-> Mobile works
I've NOT tested voice calls, SMS, MMS
...
The current bug is below, but it is poorly named either it should be
renamed or a new bug created.
Bug:
13190133
Change-Id: I0a09f642614cd27a8655e9dae764b8999ce485b8
Adrian Roos [Tue, 18 Mar 2014 17:33:14 +0000 (18:33 +0100)]
DO NOT MERGE - Fix keyguard pattern lockout bug
(cherry picked from commit
91c9561cbe665f91e1665f30362c409ae180b127)
Bug:
13302967
Change-Id: I35e7319f8767b2320dc11d9bfe8dc034e2a39b28
Ricardo Cervera [Tue, 18 Mar 2014 17:22:58 +0000 (17:22 +0000)]
am
808779d1: am
965e5e85: am
ace69017: docs: Reverted ADT 22.6.1 links
* commit '
808779d1898a9011a8a4e05e6cfb2f005ecae47c':
docs: Reverted ADT 22.6.1 links
Ricardo Cervera [Tue, 18 Mar 2014 17:17:30 +0000 (17:17 +0000)]
am
965e5e85: am
ace69017: docs: Reverted ADT 22.6.1 links
* commit '
965e5e8520d040ce7e064db665982eb98c626b2b':
docs: Reverted ADT 22.6.1 links
Ricardo Cervera [Tue, 18 Mar 2014 17:11:58 +0000 (17:11 +0000)]
am
ace69017: docs: Reverted ADT 22.6.1 links
* commit '
ace69017443eac3101bf5e36f863fd3cf80cce9f':
docs: Reverted ADT 22.6.1 links
Ricardo Cervera [Tue, 18 Mar 2014 17:02:06 +0000 (10:02 -0700)]
docs: Reverted ADT 22.6.1 links
Change-Id: Ic08cd7df8d50235e6a673f00dda6baa6863c9025
Scott Main [Tue, 18 Mar 2014 12:57:30 +0000 (12:57 +0000)]
am
89f0e768: am
f60dd6e2: am
50d7dc99: add ALL of the Android Wear Dev Preview docs to DAC these were built from the klp-cw-preview-release branch.
* commit '
89f0e768139c5d39d971e9fce9b7120857f9430d':
add ALL of the Android Wear Dev Preview docs to DAC these were built from the klp-cw-preview-release branch.
Scott Main [Tue, 18 Mar 2014 12:54:45 +0000 (12:54 +0000)]
am
f60dd6e2: am
50d7dc99: add ALL of the Android Wear Dev Preview docs to DAC these were built from the klp-cw-preview-release branch.
* commit '
f60dd6e2d2765b01018da69dc9ee776e50b47431':
add ALL of the Android Wear Dev Preview docs to DAC these were built from the klp-cw-preview-release branch.
Scott Main [Tue, 18 Mar 2014 12:51:40 +0000 (12:51 +0000)]
am
50d7dc99: add ALL of the Android Wear Dev Preview docs to DAC these were built from the klp-cw-preview-release branch.
* commit '
50d7dc99e507082c81476ea1474de9970589dee5':
add ALL of the Android Wear Dev Preview docs to DAC these were built from the klp-cw-preview-release branch.
Scott Main [Tue, 18 Mar 2014 12:13:12 +0000 (05:13 -0700)]
add ALL of the Android Wear Dev Preview docs to DAC
these were built from the klp-cw-preview-release branch.
Change-Id: I9beef683528cfe57b4d088fe7adeb1638b89a640
Scott Main [Tue, 18 Mar 2014 12:13:08 +0000 (12:13 +0000)]
am
e77c260b: am
60409d80: am
81857ec5: add android wear to the home carousel
* commit '
e77c260b3aa86d97643a69da75cd03ac1e7cef23':
add android wear to the home carousel
Scott Main [Tue, 18 Mar 2014 12:09:53 +0000 (12:09 +0000)]
am
60409d80: am
81857ec5: add android wear to the home carousel
* commit '
60409d802e5df6f85f1f91036327a146b48601c1':
add android wear to the home carousel
Scott Main [Tue, 18 Mar 2014 12:05:40 +0000 (12:05 +0000)]
am
81857ec5: add android wear to the home carousel
* commit '
81857ec572b133f99cdbcd575774eb5f9be073b0':
add android wear to the home carousel
Scott Main [Tue, 18 Mar 2014 09:59:13 +0000 (02:59 -0700)]
add android wear to the home carousel
Change-Id: I1dc50100dd50a710a23b08f677121d499c166b3f
Narayan Kamath [Tue, 18 Mar 2014 09:41:31 +0000 (09:41 +0000)]
am
d2133079: am
7c0dfed5: Merge "Pass int32_t for JNI calls to java Input/Output streams."
* commit '
d2133079c085cb0879facc8ee72678524d22571a':
Pass int32_t for JNI calls to java Input/Output streams.
Narayan Kamath [Tue, 18 Mar 2014 09:38:24 +0000 (02:38 -0700)]
am
7c0dfed5: Merge "Pass int32_t for JNI calls to java Input/Output streams."
* commit '
7c0dfed535bd23ce7cce0f8c498a8d6d3f14ff0f':
Pass int32_t for JNI calls to java Input/Output streams.
Narayan Kamath [Tue, 18 Mar 2014 09:34:43 +0000 (09:34 +0000)]
Merge "Pass int32_t for JNI calls to java Input/Output streams."
Akira Numata [Thu, 13 Mar 2014 04:36:31 +0000 (13:36 +0900)]
Insufficient ProcessRecord cleanup when persistent process is killed
When persistent process with Service restarts, ActivityManagerService
does not reset ProcessRecord#hasClientActivites to false
(because ProcessRecord of persistent process is continued using
after killing).
It disturbs updating LRU list in ActivityManagerService, and then,
when new process calls ActivityManagerProxy#publishContentProviders,
SecurityException happens because of no entry in the list.
Bug:
13517358
Change-Id: I46b064f71a4f7025ade1bf117801352a7ab22e6a
Mark Renouf [Tue, 18 Mar 2014 02:02:59 +0000 (02:02 +0000)]
am
29799080: Make InternalListener static to avoid referencing SpeechRecognizer.
* commit '
297990806dcbdc4413314847b897c9cb5452a1bc':
Make InternalListener static to avoid referencing SpeechRecognizer.
Mark Renouf [Mon, 17 Mar 2014 21:51:35 +0000 (17:51 -0400)]
Make InternalListener static to avoid referencing SpeechRecognizer.
Change-Id: I03bc1a5f5188551608395f3468aa69e622601820
(cherry picked from commit
b37866db469e81aca534ff6186bdafd44352329b)
Ricardo Cervera [Tue, 18 Mar 2014 00:20:52 +0000 (00:20 +0000)]
am
97a05b39: am
f7c3ecc1: am
71a47aa7: Merge "docs: Added release notes for SDK 22.6.1" into klp-docs
* commit '
97a05b39fc6f680913bba17f939ad65ceb09fc23':
docs: Added release notes for SDK 22.6.1
Ricardo Cervera [Mon, 17 Mar 2014 22:14:25 +0000 (22:14 +0000)]
am
f7c3ecc1: am
71a47aa7: Merge "docs: Added release notes for SDK 22.6.1" into klp-docs
* commit '
f7c3ecc1e14ebe3666822ad23f9da340f731d1b9':
docs: Added release notes for SDK 22.6.1
Ricardo Cervera [Mon, 17 Mar 2014 22:11:12 +0000 (22:11 +0000)]
am
71a47aa7: Merge "docs: Added release notes for SDK 22.6.1" into klp-docs
* commit '
71a47aa7f0ea18bc4d10d87a1932c9f19554fb15':
docs: Added release notes for SDK 22.6.1
Ricardo Cervera [Mon, 17 Mar 2014 22:07:17 +0000 (22:07 +0000)]
Merge "docs: Added release notes for SDK 22.6.1" into klp-docs
Ricardo Cervera [Fri, 7 Mar 2014 22:53:35 +0000 (14:53 -0800)]
docs: Added release notes for SDK 22.6.1
Added release notes for SDK 22.6.1.
stage: http://quixote.mtv:8001/tools/sdk/eclipse-adt.html
Patch: Addressed Joe's comments.
Patch: Addressed Joe's comments.
Patch: Addressed Joe's comments.
Patch: Added new release notes info from Raphael.
Patch: Addressed Joe's comments.
Patch: Addressed Joe's comments.
Change-Id: I229c6b366c19d1d119ccd180ead04f7dd044de4e
Dan Sandler [Fri, 14 Mar 2014 18:48:31 +0000 (14:48 -0400)]
DO NOT MERGE: Maintain binding to crashed listeners.
Adapted from change I44ce250e, "Maintain binding to crashed
listeners from NotificationManagerService.":
> This fixes the logic on the death handlers for notification
> listeners, and doesn't unbind from the listener services so
> that the system will bring them back up again.
Bug:
12587702
Change-Id: I41d0c6733046ee9760bcfae4407e754592b805ea
Adam Lesinski [Mon, 17 Mar 2014 19:58:19 +0000 (19:58 +0000)]
am
006209c2: Merge "Remove reflection instantiation of Accessibility" into klp-modular-dev
* commit '
006209c2fc1b6deef10f6d52831e9cef35cca212':
Remove reflection instantiation of Accessibility
Adam Lesinski [Mon, 17 Mar 2014 19:56:09 +0000 (19:56 +0000)]
Merge "Remove reflection instantiation of Accessibility" into klp-modular-dev
Adam Lesinski [Mon, 17 Mar 2014 19:54:03 +0000 (12:54 -0700)]
Remove reflection instantiation of Accessibility
Accessibility is mandatory so reflection is not required.
Change-Id: Ie5c7b0bba26809425fe0f66efcc09c333138b21f
Ben Murdoch [Mon, 17 Mar 2014 19:34:12 +0000 (19:34 +0000)]
Ben Murdoch [Mon, 17 Mar 2014 19:20:43 +0000 (19:20 +0000)]
Fix JavaDoc
Change-Id: I20d0b1544ba88c694b950ef6062f93c65b16d371
Torne (Richard Coles) [Mon, 17 Mar 2014 18:02:10 +0000 (18:02 +0000)]
am
01252217: Merge "Fix javadoc." into klp-modular-dev
* commit '
01252217a5d779c885645028a5df70215e7be4f4':
Fix javadoc.
Torne (Richard Coles) [Mon, 17 Mar 2014 17:58:29 +0000 (17:58 +0000)]
Merge "Fix javadoc." into klp-modular-dev
Geoff Mendal [Mon, 17 Mar 2014 17:57:59 +0000 (17:57 +0000)]
am
02899291: (-s ours) am
c3281db2: (-s ours) am
65325236: (-s ours) Import translations. DO NOT MERGE
* commit '
028992915f75c858f177d0f61ea469bc47ea50b4':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Mar 2014 17:54:58 +0000 (17:54 +0000)]
am
c3281db2: (-s ours) am
65325236: (-s ours) Import translations. DO NOT MERGE
* commit '
c3281db2fb874f56d5612b9d3f07bd91067755ac':
Import translations. DO NOT MERGE
Torne (Richard Coles) [Mon, 17 Mar 2014 17:51:40 +0000 (17:51 +0000)]
Fix javadoc.
Fix javadoc reference missing a #
Bug:
13246311
Change-Id: Ifc06234943339250feb5b4f2077af03c35be076e
Geoff Mendal [Mon, 17 Mar 2014 16:46:53 +0000 (16:46 +0000)]
am
65325236: (-s ours) Import translations. DO NOT MERGE
* commit '
6532523652cf16d3e498939965defab4bd22c491':
Import translations. DO NOT MERGE
Jeff Sharkey [Mon, 17 Mar 2014 16:39:13 +0000 (16:39 +0000)]
am
eeb36c5c: am
d88d8174: Merge "Null pointer exception in FileRotator.java"
* commit '
eeb36c5cfc107fe9128490e9e127c2bca2d24e28':
Null pointer exception in FileRotator.java
Jeff Sharkey [Mon, 17 Mar 2014 16:36:03 +0000 (09:36 -0700)]
am
d88d8174: Merge "Null pointer exception in FileRotator.java"
* commit '
d88d817498327462f42e50348239eac59147f310':
Null pointer exception in FileRotator.java
Geoff Mendal [Mon, 17 Mar 2014 16:34:19 +0000 (09:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0b2d6484e67628d26f34d3be39b8b11f009151bd
Auto-generated-cl: translation import
Jeff Sharkey [Mon, 17 Mar 2014 16:32:05 +0000 (16:32 +0000)]
Merge "Null pointer exception in FileRotator.java"
Leon Scroggins III [Mon, 17 Mar 2014 15:55:46 +0000 (15:55 +0000)]
am
2fd045c0: DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:
13191516
* commit '
2fd045c092b08772be81a6d58bbb95e5e608403f':
DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:
13191516
Leon Scroggins III [Mon, 17 Mar 2014 15:55:43 +0000 (15:55 +0000)]
am
f8d8777d: Update framework to use M33 Skia. DO NOT MERGE
* commit '
f8d8777dddf91c741981b4f795f2fb2b1d81c1b6':
Update framework to use M33 Skia. DO NOT MERGE
Leon Scroggins III [Tue, 14 Jan 2014 20:14:57 +0000 (15:14 -0500)]
DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2
BUG:
13191516
Original CLs below:
In nativeDecodeFileDescriptor, use fdopen.
Instead of attempting to mmap the entire file, create an
SkFILEStream from a FILE.
BUG:
11669944
BUG:
11028218
Cherry-pick from: If67da91484acc79f9f3dde6d05201409c0c75e41
-------------------------------------------------------------------------
Decode file descriptor from the correct offset.
Fix a few bugs in nativeDecodeFileDescriptor:
1. Restore the FD's offset when exiting the function.
2. Copy the data when potentially using an SkImageRef.
The old behavior would have continued to modify the
file descriptor's offset each time a new decode was
required. The copy ensures that the file descriptor
remains unchanged.
3. Buffer the file stream.
Prior to this change, if the image was not a PNG,
the stream would be rewound to the beginning of the
file, even if the file descriptor was passed in with
an offset. Thanks to the buffer, the stream is only
rewound to the original offset.
Depends on https://googleplex-android-review.googlesource.com/#/c/415821/1
in external/skia
BUG:
12807677
BUG:
12895876
Cherry-pick from: I38b8cf5d210dbbc0107e6562e3884867de57fc4b
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
Conflicts:
core/jni/android/graphics/Bitmap.cpp
core/jni/android/graphics/Graphics.cpp
core/jni/android/graphics/Typeface.cpp
graphics/java/android/graphics/Bitmap.java
Ashok Bhat [Wed, 5 Mar 2014 12:40:53 +0000 (12:40 +0000)]
Pass int32_t for JNI calls to java Input/Output streams.
Passing size_t is problematic on 64 bit platforms where
it's 8 bytes in size. Conversion to int32_t is safe because
the size argument is always clamped to fCapacity, which is
4 bytes wide.
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Change-Id: I58558561a4f56451485f1a5fc6cdeda677247071
Steve Moyer [Sun, 16 Mar 2014 17:31:18 +0000 (17:31 +0000)]
am
05d855de: am
d93e7b24: Merge "Don\'t attempt to launch disabled activities in smoke test."
* commit '
05d855defe8610854592ddd7baf5644ac6d4da15':
Don't attempt to launch disabled activities in smoke test.
Steve Moyer [Sun, 16 Mar 2014 17:29:25 +0000 (10:29 -0700)]
am
d93e7b24: Merge "Don\'t attempt to launch disabled activities in smoke test."
* commit '
d93e7b2424b7ab442065b0d9cecb8b72a9c5c8ed':
Don't attempt to launch disabled activities in smoke test.
Steve Moyer [Sun, 16 Mar 2014 17:26:43 +0000 (17:26 +0000)]
Merge "Don't attempt to launch disabled activities in smoke test."
Craig Mautner [Fri, 14 Mar 2014 23:54:46 +0000 (23:54 +0000)]
am
ca0aba39: Merge commit \'
54d5702c\' into manualmerge
* commit '
ca0aba399326886d1a39c2344bab296044ba5eb0':
Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE.
Craig Mautner [Fri, 14 Mar 2014 23:49:50 +0000 (16:49 -0700)]
Merge commit '
54d5702c' into manualmerge
Conflicts:
services/core/java/com/android/server/am/TaskRecord.java
Change-Id: Id7bc15b6c3e47d8705c228b311c4d85a47c13dbe
Tim Kilbourn [Fri, 14 Mar 2014 23:33:11 +0000 (23:33 +0000)]
am
9539b4a0: Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-dev
* commit '
9539b4a02f74b447db0e3aa1039229f6b913aa87':
FEATURE_LEANBACK implies that the device is a tv.
Marco Nelissen [Fri, 14 Mar 2014 23:33:02 +0000 (23:33 +0000)]
am
203a6ddb: am
105c4792: am
10a07a04: Merge "Verify certificates" into klp-dev
* commit '
203a6ddb0c098821ff36511e2a98211a90a69954':
Verify certificates
Daniel 2 Olofsson [Fri, 14 Mar 2014 23:33:00 +0000 (23:33 +0000)]
am
39fc43b0: am
4111e7e1: am
09421fab: Re-initialize error after attach
* commit '
39fc43b0f91e8d92fc4251e11384c4ea6544cf35':
Re-initialize error after attach
Tim Kilbourn [Fri, 14 Mar 2014 23:13:45 +0000 (23:13 +0000)]
Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-dev
Marco Nelissen [Fri, 14 Mar 2014 22:55:50 +0000 (22:55 +0000)]
am
105c4792: am
10a07a04: Merge "Verify certificates" into klp-dev
* commit '
105c47924f7af9319ec9242b952b4bf074585229':
Verify certificates
Daniel 2 Olofsson [Fri, 14 Mar 2014 22:55:45 +0000 (22:55 +0000)]
am
4111e7e1: am
09421fab: Re-initialize error after attach
* commit '
4111e7e17665b1142853c71e9fd1cf6af5f68b82':
Re-initialize error after attach
Craig Mautner [Fri, 14 Mar 2014 22:36:15 +0000 (22:36 +0000)]
am
477897ad: Merge "Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE." into klp-dev
* commit '
477897ad7b0725fa68d32a94bf8c24264068fd5c':
Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE.
Marco Nelissen [Fri, 14 Mar 2014 22:32:02 +0000 (22:32 +0000)]
am
10a07a04: Merge "Verify certificates" into klp-dev
* commit '
10a07a043f7fa47148ae2cc2fcd6b0edeb52190b':
Verify certificates
Craig Mautner [Fri, 14 Mar 2014 22:30:04 +0000 (22:30 +0000)]
Merge "Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE." into klp-dev
Craig Mautner [Mon, 16 Dec 2013 23:58:31 +0000 (15:58 -0800)]
Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE.
When Intent.FLAG_ACTIVITY_REORDER_TO_FRONT was set the TaskRecord
member frontOfTask was being set true incorrectly for the top
activity. It should only be true for the bottom activity. This fix
ensures that frontOfTask is always set correctly for all activities by
consoldating it into one method.
Fixes bug
12171535.
Change-Id: If982dad3c81b2b816adc5d89e7e0496923098a70