OSDN Git Service
Mindy Pereira [Thu, 26 Sep 2013 16:50:43 +0000 (09:50 -0700)]
am
d993cda2: Merge "De-blue notification backgrounds" into klp-dev
* commit '
d993cda22ab9062d4badeeeb12ec7ddf38a16be9':
De-blue notification backgrounds
Mindy Pereira [Thu, 26 Sep 2013 16:47:44 +0000 (16:47 +0000)]
Merge "De-blue notification backgrounds" into klp-dev
Dianne Hackborn [Thu, 26 Sep 2013 16:45:10 +0000 (09:45 -0700)]
am
c222f57b: Merge "Fix issue #
10919261: Don\'t clear OP_WRITE_SMS when resetting app prefs" into klp-dev
* commit '
c222f57b5c992fb661b7112a7cd5e5dbe1c6030c':
Fix issue #
10919261: Don't clear OP_WRITE_SMS when resetting app prefs
Dianne Hackborn [Thu, 26 Sep 2013 16:41:14 +0000 (16:41 +0000)]
Merge "Fix issue #
10919261: Don't clear OP_WRITE_SMS when resetting app prefs" into klp-dev
Dianne Hackborn [Wed, 25 Sep 2013 23:47:10 +0000 (16:47 -0700)]
Fix issue #
10919261: Don't clear OP_WRITE_SMS when resetting app prefs
Add a new array indicating whether each op allows itself to
be reset, and use it.
Change-Id: I494f630bda170e061196a380563512e9e77b51a8
Ari Sachter-Zeltzer [Thu, 26 Sep 2013 03:18:34 +0000 (20:18 -0700)]
am
c31f1188: Merge "deblue btn_cab_done_pressed_holo_*" into klp-dev
* commit '
c31f118825778cff15a1c1b9d1171f2ad178a013':
deblue btn_cab_done_pressed_holo_*
Ari Sachter-Zeltzer [Thu, 26 Sep 2013 03:16:23 +0000 (03:16 +0000)]
Merge "deblue btn_cab_done_pressed_holo_*" into klp-dev
Baligh Uddin [Thu, 26 Sep 2013 02:56:31 +0000 (19:56 -0700)]
am
1ffe09e2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
1ffe09e2f1db4c5e4b89c19be8b810721c9dc212':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Sep 2013 02:56:28 +0000 (19:56 -0700)]
am
bed6522a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
bed6522a69dedf4f33568efb48a7b277a70fb35a':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Sep 2013 02:53:58 +0000 (02:53 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 26 Sep 2013 02:53:54 +0000 (02:53 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Jim Miller [Thu, 26 Sep 2013 02:42:22 +0000 (19:42 -0700)]
am
1962e264: Fix keyguard widget pager accessibility - announce when widget hovers over drop target - announce when widget leaves drop target
* commit '
1962e264660b37b7e386eb2ac84fc915dd7c75dd':
Fix keyguard widget pager accessibility - announce when widget hovers over drop target - announce when widget leaves drop target
Jim Miller [Thu, 26 Sep 2013 00:08:48 +0000 (17:08 -0700)]
Fix keyguard widget pager accessibility
- announce when widget hovers over drop target
- announce when widget leaves drop target
Fixes bug
10151121
Change-Id: Ia36400f4e8651149590e004b82f66d43c9deaa08
Rob Tsuk [Thu, 26 Sep 2013 01:49:31 +0000 (18:49 -0700)]
am
7e391cb8: Merge "Replace blue pressed feedback with gray." into klp-dev
* commit '
7e391cb8acc36eb7a9f489e60e127ca8dfab37ac':
Replace blue pressed feedback with gray.
Rob Tsuk [Thu, 26 Sep 2013 01:45:01 +0000 (01:45 +0000)]
Merge "Replace blue pressed feedback with gray." into klp-dev
Ari Sachter-Zeltzer [Thu, 26 Sep 2013 01:37:17 +0000 (18:37 -0700)]
deblue btn_cab_done_pressed_holo_*
Change-Id: Iff3faa91e36d0b19ebf5c166e44e29145b8493b1
Ari Sachter-Zeltzer [Thu, 26 Sep 2013 00:31:11 +0000 (17:31 -0700)]
am
a53b8541: Merge "removing unused kg_* assets from fbc" into klp-dev
* commit '
a53b854103c06f194a1883275d5cdfd78882a248':
removing unused kg_* assets from fbc
Ari Sachter-Zeltzer [Thu, 26 Sep 2013 00:26:28 +0000 (00:26 +0000)]
Merge "removing unused kg_* assets from fbc" into klp-dev
Baligh Uddin [Thu, 26 Sep 2013 00:19:25 +0000 (17:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8d908dee86b15624d846ab335337b88b371ed5d5
Auto-generated-cl: translation import
Ari Sachter-Zeltzer [Thu, 26 Sep 2013 00:15:23 +0000 (17:15 -0700)]
removing unused kg_* assets from fbc
Change-Id: I536eab0bbbaefc7fb01afe1ccac108dca45d9bf9
Zhijun He [Thu, 26 Sep 2013 00:00:05 +0000 (17:00 -0700)]
am
822ac0ba: Merge "Camera2: Implement CameraManager#getCameraCharacteristics" into klp-dev
* commit '
822ac0bada06b2185b4d5e8304160b680a72cff2':
Camera2: Implement CameraManager#getCameraCharacteristics
Zhijun He [Wed, 25 Sep 2013 23:57:24 +0000 (23:57 +0000)]
Merge "Camera2: Implement CameraManager#getCameraCharacteristics" into klp-dev
Scott Main [Wed, 25 Sep 2013 23:56:10 +0000 (16:56 -0700)]
am
8b21bbe4: am
6b1f6feb: am
ad95c415: am
857814c6: add mention of google cloud to Android Studio landing page
* commit '
8b21bbe440f1561107bc09d26c7dc12eef01fb21':
add mention of google cloud to Android Studio landing page
Adam Powell [Wed, 25 Sep 2013 23:56:07 +0000 (16:56 -0700)]
am
4598cd65: Merge "Update toast appearance" into klp-dev
* commit '
4598cd65ccc7989fda531dc8fb3ee80d461f0c82':
Update toast appearance
Scott Main [Wed, 25 Sep 2013 23:54:04 +0000 (16:54 -0700)]
am
6b1f6feb: am
ad95c415: am
857814c6: add mention of google cloud to Android Studio landing page
* commit '
6b1f6febdcf8f70d74ffa3fb7d0e0a088afd3d5d':
add mention of google cloud to Android Studio landing page
Scott Main [Wed, 25 Sep 2013 23:51:51 +0000 (16:51 -0700)]
am
ad95c415: am
857814c6: add mention of google cloud to Android Studio landing page
* commit '
ad95c41518c22264540a777562db23a8ccfa792a':
add mention of google cloud to Android Studio landing page
Adam Powell [Wed, 25 Sep 2013 23:51:38 +0000 (23:51 +0000)]
Merge "Update toast appearance" into klp-dev
Scott Main [Wed, 25 Sep 2013 23:48:58 +0000 (16:48 -0700)]
am
857814c6: add mention of google cloud to Android Studio landing page
* commit '
857814c688e6c867cf1e433091931bc84d15d1cb':
add mention of google cloud to Android Studio landing page
Adam Powell [Wed, 25 Sep 2013 22:47:50 +0000 (15:47 -0700)]
Update toast appearance
Use a condensed font and give the toast frame a more rounded look.
Bug
10734759
Change-Id: I6a4366dbf2fd5a81f0ad2d50697ea2399a7942fc
Baligh Uddin [Wed, 25 Sep 2013 23:33:59 +0000 (16:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4842b7afb76ee393c19a39d0818f3f2066616803
Auto-generated-cl: translation import
Scott Main [Tue, 24 Sep 2013 15:54:35 +0000 (08:54 -0700)]
add mention of google cloud to Android Studio landing page
Change-Id: Ia363f5384f509722aee0ef83964069767b4911f8
Dianne Hackborn [Wed, 25 Sep 2013 23:09:13 +0000 (16:09 -0700)]
am
66a9b2d7: Merge "Fix issue #
10903002: com.facebook.katana keeps itself in A Services" into klp-dev
* commit '
66a9b2d7392a7f6334b5fe23d00ba718f3fa1851':
Fix issue #
10903002: com.facebook.katana keeps itself in A Services
Jeff Sharkey [Wed, 25 Sep 2013 23:05:36 +0000 (16:05 -0700)]
am
be17a614: Merge "Require that persistable Uri permissions be taken." into klp-dev
* commit '
be17a61447e1a7992a6c855059a3c43ab3216610':
Require that persistable Uri permissions be taken.
Jake Hamby [Wed, 25 Sep 2013 23:05:33 +0000 (16:05 -0700)]
am
c499f5b2: Merge "wappush: Use valid index for pdu including garbages" into klp-dev
* commit '
c499f5b2f7713507541ef655f65fbe154b34070a':
wappush: Use valid index for pdu including garbages
Dianne Hackborn [Wed, 25 Sep 2013 23:04:50 +0000 (23:04 +0000)]
Merge "Fix issue #
10903002: com.facebook.katana keeps itself in A Services" into klp-dev
Jeff Sharkey [Wed, 25 Sep 2013 23:01:25 +0000 (23:01 +0000)]
Merge "Require that persistable Uri permissions be taken." into klp-dev
Jake Hamby [Wed, 25 Sep 2013 23:01:02 +0000 (23:01 +0000)]
Merge "wappush: Use valid index for pdu including garbages" into klp-dev
Dianne Hackborn [Wed, 25 Sep 2013 06:10:14 +0000 (23:10 -0700)]
Fix issue #
10903002: com.facebook.katana keeps itself in A Services
Now when memory low, if a service's process is above
a selected pss, then the process is not allowed to go
in to the service a list.
Also simplified the normal meminfo details dump to not
include the shared dirty and shared clean sizes by
default, since these can be very confusing. You will
still get to see them with the "-a" flag.
Finally some small steps to better managing service
processes in the LRU list, so hopefully we can some
day be better about letting them drop down in the list
when there isn't really much interesting happening in
the process. Not yet used at this point.
Change-Id: I654bfd6d05de2a63120185ebb15ffda8cbeb5dac
Winson Chung [Wed, 25 Sep 2013 22:44:18 +0000 (15:44 -0700)]
am
92baafb4: Merge "Moving Launcher permission to Framework. (Bug
10343529)" into klp-dev
* commit '
92baafb43a825e7585259dcb2da9c7b03d0cf72c':
Moving Launcher permission to Framework. (Bug
10343529)
Jim Miller [Wed, 25 Sep 2013 22:44:15 +0000 (15:44 -0700)]
am
04b0840b: Merge "Accessibility improvements in keyguard - add accessibility descriptions to camera and search light - add new onClick handler to simplify launching search and camera - plumb camera launch through KeyguardService interface" into klp-dev
* commit '
04b0840b2e5367547fdd92f4e2c68cde16486062':
Accessibility improvements in keyguard - add accessibility descriptions to camera and search light - add new onClick handler to simplify launching search and camera - plumb camera launch through KeyguardService interface
Winson Chung [Wed, 25 Sep 2013 22:43:16 +0000 (22:43 +0000)]
Merge "Moving Launcher permission to Framework. (Bug
10343529)" into klp-dev
Jim Miller [Wed, 25 Sep 2013 22:41:26 +0000 (22:41 +0000)]
Merge "Accessibility improvements in keyguard - add accessibility descriptions to camera and search light - add new onClick handler to simplify launching search and camera - plumb camera launch through KeyguardService interface" into klp-dev
Romain Guy [Wed, 25 Sep 2013 22:34:31 +0000 (15:34 -0700)]
am
318ae7bb: Take SkBitmap\'s stride into account when uploading textures Bug #
10151807
* commit '
318ae7bb92869d99a05388c598ad105e7aa4cdbd':
Take SkBitmap's stride into account when uploading textures Bug #
10151807
Romain Guy [Wed, 25 Sep 2013 01:44:54 +0000 (18:44 -0700)]
Take SkBitmap's stride into account when uploading textures
Bug #
10151807
Change-Id: I7ba4804fa3619088fea70eb55f10519fff0bf5f0
Leon Scroggins III [Wed, 25 Sep 2013 22:30:55 +0000 (15:30 -0700)]
am
8e4b16d6: Merge "Update docs to state that mark is no longer called." into klp-dev
* commit '
8e4b16d67851ad5eb91c82955b3c3d59f0770b6b':
Update docs to state that mark is no longer called.
Leon Scroggins III [Wed, 25 Sep 2013 22:27:25 +0000 (22:27 +0000)]
Merge "Update docs to state that mark is no longer called." into klp-dev
Alan Viverette [Wed, 25 Sep 2013 22:23:50 +0000 (15:23 -0700)]
am
812b6426: Merge "Fix caption rendering" into klp-dev
* commit '
812b64264176cb8a253a8253074bc9595503d2ac':
Fix caption rendering
Alan Viverette [Wed, 25 Sep 2013 22:21:07 +0000 (22:21 +0000)]
Merge "Fix caption rendering" into klp-dev
Winson Chung [Wed, 25 Sep 2013 22:17:40 +0000 (15:17 -0700)]
Moving Launcher permission to Framework. (Bug
10343529)
Change-Id: Ic48c254c844e65171b5f92d81272962cdc673acc
Jeff Sharkey [Fri, 20 Sep 2013 21:30:59 +0000 (14:30 -0700)]
Require that persistable Uri permissions be taken.
Change our Intent flag to indicate that a Uri permission grant is
persistable, but don't actually persist it until explicitly taken by
the receiving app. This prevents apps from spamming each other if
persisted permissions aren't really required.
Remember the last time a persisted grant was taken by an app, and
use this to prune away the oldest grants when the number of grants
grows too large. Allow apps to query persisted grants they are
holding, and allow them to release previously persisted grants. Add
public UriPermission class to return grant details and timestamp.
Track various permission strengths separately, and combine together
after each mutation pass. Persistable grants are currently treated
like global grants, but they could be moved to have owners in the
future. Require that grant holders trying to extend a persistable
permission actually hold a persistable permission themselves.
Bug:
10835779
Change-Id: I95b2f797c04ce7fd2612f9a644685dbd44e03759
Jim Miller [Wed, 25 Sep 2013 22:07:49 +0000 (15:07 -0700)]
am
3264ec7a: Merge "Fit and finish for navbar camera affordance" into klp-dev
* commit '
3264ec7ab5efe8592523a68d4b69c5f2f8f514da':
Fit and finish for navbar camera affordance
Jim Miller [Wed, 25 Sep 2013 22:04:49 +0000 (22:04 +0000)]
Merge "Fit and finish for navbar camera affordance" into klp-dev
Leon Scroggins III [Wed, 25 Sep 2013 21:49:45 +0000 (17:49 -0400)]
Update docs to state that mark is no longer called.
BUG:
6493544
Change-Id: I97a4d90ce2efcd12f8f1cc5b545f822f8e5a5ab0
Jim Miller [Wed, 25 Sep 2013 20:46:58 +0000 (13:46 -0700)]
Accessibility improvements in keyguard
- add accessibility descriptions to camera and search light
- add new onClick handler to simplify launching search and camera
- plumb camera launch through KeyguardService interface
Fixes bug
10914360
Change-Id: Ic85eda9afadba7381be78b477180f7204030cd17
Jim Miller [Wed, 25 Sep 2013 21:55:31 +0000 (14:55 -0700)]
am
d7fdcad2: Merge "Fix accessibility for all-caps items in keyguard" into klp-dev
* commit '
d7fdcad22683e6191e92141a7e45e2414fe40a44':
Fix accessibility for all-caps items in keyguard
Jim Miller [Wed, 25 Sep 2013 21:53:40 +0000 (21:53 +0000)]
Merge "Fix accessibility for all-caps items in keyguard" into klp-dev
Jeff Sharkey [Wed, 25 Sep 2013 21:46:33 +0000 (14:46 -0700)]
am
82b05f59: Merge "Handle null stacks gracefully." into klp-dev
* commit '
82b05f599bf3c84e53d42599ef257b3e9642855d':
Handle null stacks gracefully.
Jeff Sharkey [Wed, 25 Sep 2013 21:43:43 +0000 (21:43 +0000)]
Merge "Handle null stacks gracefully." into klp-dev
Jeff Sharkey [Wed, 25 Sep 2013 21:39:14 +0000 (14:39 -0700)]
Handle null stacks gracefully.
Bug:
10928395
Change-Id: Ie7c3f7e0eb068ece0cf678a5d6346f18a413856b
Sungmin Choi [Sat, 21 Sep 2013 06:24:58 +0000 (23:24 -0700)]
wappush: Use valid index for pdu including garbages
For some operators, pdu has garbages. As a result, device does not receive
MMS or operator some requests.
To fix it, use valid index for operators.
Bug:
10492745
Change-Id: Ic7262f7369403bd060d94c5da0e09f18c96ff3db
Rob Tsuk [Wed, 25 Sep 2013 20:33:50 +0000 (13:33 -0700)]
Replace blue pressed feedback with gray.
Change-Id: I72070411fedd2883417310197ee86e0ad958a899
Vinit Deshapnde [Wed, 25 Sep 2013 21:11:04 +0000 (14:11 -0700)]
am
e7d6bbd6: Merge "Fix an incorrectly created race accessing Wifi Supplicant" into klp-dev
* commit '
e7d6bbd67fbf50fdff87d1bee67e3410904867c5':
Fix an incorrectly created race accessing Wifi Supplicant
Marco Nelissen [Wed, 25 Sep 2013 21:11:01 +0000 (14:11 -0700)]
am
d7b5f3da: Merge "Fix hang" into klp-dev
* commit '
d7b5f3dab1c3bc0aa98698314183149426559a3c':
Fix hang
Vinit Deshapnde [Wed, 25 Sep 2013 21:07:51 +0000 (21:07 +0000)]
Merge "Fix an incorrectly created race accessing Wifi Supplicant" into klp-dev
Marco Nelissen [Wed, 25 Sep 2013 21:06:46 +0000 (21:06 +0000)]
Merge "Fix hang" into klp-dev
Zhijun He [Wed, 25 Sep 2013 17:05:59 +0000 (10:05 -0700)]
Camera2: Implement CameraManager#getCameraCharacteristics
Bug:
10904541
Bug:
10360518
Change-Id: I1da0b0319703fda46789f15a232e56ed1d928bc3
Marco Nelissen [Wed, 25 Sep 2013 20:45:41 +0000 (13:45 -0700)]
Fix hang
b/
10855561
Change-Id: I29b046b835ce0ca3644e5c2e8f9bca5c0b380d4b
Alan Viverette [Wed, 25 Sep 2013 19:35:00 +0000 (12:35 -0700)]
Fix caption rendering
Fixed rendering of captions in regions and incorrect caption width
measurement. Removes minimum-difference line wrapping, since the
results weren't consistent with StaticLayout's rendering.
BUG:
10917766,
10822229
Change-Id: I55ef28cbf383fd6b945c0be62e440781288364f1
Eino-Ville Talvala [Wed, 25 Sep 2013 19:32:53 +0000 (12:32 -0700)]
am
9ca833f4: Merge "Camera2: Add PASSIVE_UNFOCUSED autofocus state." into klp-dev
* commit '
9ca833f4a5eca732b1618bc1a183215c21ae11e5':
Camera2: Add PASSIVE_UNFOCUSED autofocus state.
Eino-Ville Talvala [Wed, 25 Sep 2013 19:28:03 +0000 (19:28 +0000)]
Merge "Camera2: Add PASSIVE_UNFOCUSED autofocus state." into klp-dev
Dianne Hackborn [Wed, 25 Sep 2013 18:45:38 +0000 (11:45 -0700)]
am
4213e68f: am
3a7d5f71: Merge "Replace SEAndroid with SELinux."
* commit '
4213e68f67d59c0912d2a8729fcec4539197756a':
Replace SEAndroid with SELinux.
Dianne Hackborn [Wed, 25 Sep 2013 18:42:07 +0000 (11:42 -0700)]
am
3a7d5f71: Merge "Replace SEAndroid with SELinux."
* commit '
3a7d5f71456b57f712b0f878beb5317f0ce6d564':
Replace SEAndroid with SELinux.
Dianne Hackborn [Wed, 25 Sep 2013 18:39:57 +0000 (18:39 +0000)]
Merge "Replace SEAndroid with SELinux."
Baligh Uddin [Wed, 25 Sep 2013 16:23:24 +0000 (09:23 -0700)]
am
1b87107b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
1b87107bb37be580888f1617d047ca9009c18a7f':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 25 Sep 2013 16:23:21 +0000 (09:23 -0700)]
am
99296322: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
99296322bc5ae3aabf89bd2b424492ec93b35c1a':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 25 Sep 2013 16:23:18 +0000 (09:23 -0700)]
am
cb94b3ee: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
cb94b3ee54df1485cc6a0757d91f0af01651fa1a':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 25 Sep 2013 16:23:15 +0000 (09:23 -0700)]
am
9832b08a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
9832b08a49adaee5c3bb7c51ce0f6db78ccf11e2':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 25 Sep 2013 16:23:12 +0000 (09:23 -0700)]
am
c8321a59: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
c8321a59a30b9fd5d3adfde30e95a9a827f4f554':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 25 Sep 2013 16:23:09 +0000 (09:23 -0700)]
am
46485d6d: (-s ours) Import translations. DO NOT MERGE
* commit '
46485d6df60e11d04d976bc7ec5c9c8cdec14900':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 25 Sep 2013 16:19:06 +0000 (16:19 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Wed, 25 Sep 2013 16:18:59 +0000 (16:18 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Wed, 25 Sep 2013 16:18:49 +0000 (16:18 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Wed, 25 Sep 2013 16:18:39 +0000 (16:18 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Wed, 25 Sep 2013 16:18:14 +0000 (16:18 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Wed, 25 Sep 2013 16:13:10 +0000 (09:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id86ce8166f481fa6a360ebb479f2e420ead1ee15
Auto-generated-cl: translation import
Baligh Uddin [Wed, 25 Sep 2013 16:11:27 +0000 (09:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iea99a461037b5ef6dc3cd573b594b483692222ef
Auto-generated-cl: translation import
Baligh Uddin [Wed, 25 Sep 2013 16:07:42 +0000 (09:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifaa3920e5a0d002b7bdb9eb668acf5cbc36729fc
Auto-generated-cl: translation import
Baligh Uddin [Wed, 25 Sep 2013 16:06:40 +0000 (09:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: If20827776d647c8120b53065eb304b7d01409cd6
Auto-generated-cl: translation import
Baligh Uddin [Wed, 25 Sep 2013 15:43:59 +0000 (08:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: I16a7cfc8d9c5926a40a4ddca551f4281accb415f
Auto-generated-cl: translation import
Baligh Uddin [Wed, 25 Sep 2013 15:42:54 +0000 (08:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id5391f651538cc46ad7455dedaa3426e29efc9c9
Auto-generated-cl: translation import
Jean Chalard [Wed, 25 Sep 2013 15:11:31 +0000 (08:11 -0700)]
am
6a1e32ef: Merge "Don\'t change the text in reaction to a user dict add" into klp-dev
* commit '
6a1e32efb686bd5606f62076c70f399ff3bdc37d':
Don't change the text in reaction to a user dict add
Jean Chalard [Wed, 25 Sep 2013 07:50:15 +0000 (07:50 +0000)]
Merge "Don't change the text in reaction to a user dict add" into klp-dev
Christopher Tate [Wed, 25 Sep 2013 01:23:16 +0000 (18:23 -0700)]
am
044fd573: Merge "Don\'t crash when no alarms are scheduled" into klp-dev
* commit '
044fd573ce58142309f9fc503cf5d52af447d082':
Don't crash when no alarms are scheduled
Christopher Tate [Wed, 25 Sep 2013 01:20:38 +0000 (01:20 +0000)]
Merge "Don't crash when no alarms are scheduled" into klp-dev
Elliott Hughes [Wed, 25 Sep 2013 00:54:42 +0000 (17:54 -0700)]
am
d82b1c3b: am
9d8721f8: Merge "Remove dead code."
* commit '
d82b1c3bf2abbc1582c90362267650cf05d38cd5':
Remove dead code.
Elliott Hughes [Wed, 25 Sep 2013 00:51:58 +0000 (17:51 -0700)]
am
9d8721f8: Merge "Remove dead code."
* commit '
9d8721f8abb018429e3dba2296bce789b776aa0c':
Remove dead code.
Elliott Hughes [Wed, 25 Sep 2013 00:47:54 +0000 (00:47 +0000)]
Merge "Remove dead code."
Vinit Deshapnde [Wed, 25 Sep 2013 00:38:09 +0000 (17:38 -0700)]
Fix an incorrectly created race accessing Wifi Supplicant
ScanModeState is trying to undo whatever it did in its enter(), in its
exit() function. But doing that is incorrect because it is possible to
transition to multiple states that require different conditions.
In this bug, the state machine transitioned from ScanModeState to
WaitForP2pDisabled state; in response to Stop Supplicant command. Well,
when we are trying to stop supplicant, there is clearly no need to
enable P2P or load all networks. But since this code exists in exit(),
it is executed nonetheless, causing race conditions accessing the
wpa_supplicant (WifiStateMachine is trying to shut it down, but
P2pStateMachine is trying to bring up the p2p interfaces).
We solve that problem by moving this code to the place where we transition
to DisconnectedState - since that's the state that needs this as a
precondition.
Bug:
10761752
Change-Id: Iaf0ffd8056de8533b5d2bfdf8c440fbb7e406dac
Craig Mautner [Wed, 25 Sep 2013 00:31:57 +0000 (17:31 -0700)]
am
8488f9fa: Merge "Be less aggressive when not resuming top activity" into klp-dev
* commit '
8488f9fa2e38e75e7ecbaac7d776900f8f1e5917':
Be less aggressive when not resuming top activity
Craig Mautner [Wed, 25 Sep 2013 00:28:20 +0000 (00:28 +0000)]
Merge "Be less aggressive when not resuming top activity" into klp-dev