drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
114,984 Commits 1 Branch 0 Tags
Commit Graph

114984 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
488bb0ed6a Cleanup Binder interface between sensorservice and BatteryStats 
Change-Id: I6ba542cea242e252864d562ba62f3b8136f09f90
 2013-09-25 09:27:18 -07:00
Baligh Uddin
7ee0edac09 am 39d07b27: (-s ours) am 1b87107b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '39d07b2748cd388e7b8540a090ef455b965546ba':
  Import translations. DO NOT MERGE
 2013-09-25 09:26:36 -07:00
Baligh Uddin
d073e2de2f am 721e53e8: (-s ours) am 99296322: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '721e53e86b759a77e2f590e3586c76da577df1ae':
  Import translations. DO NOT MERGE
 2013-09-25 09:26:33 -07:00
Baligh Uddin
9f6765eadc am 467b5bee: (-s ours) am cb94b3ee: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '467b5bee65bb1d75b80d88f033c22611e57b429f':
  Import translations. DO NOT MERGE
 2013-09-25 09:26:30 -07:00
Baligh Uddin
6d4c93a907 am 6ba26547: (-s ours) am 9832b08a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '6ba265479494a369b2c376b5c18d7fd308204b89':
  Import translations. DO NOT MERGE
 2013-09-25 09:26:28 -07:00
Baligh Uddin
36a57267e0 am f7710ea9: (-s ours) am c8321a59: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'f7710ea93232c4246867d0f639fa16e62a397752':
  Import translations. DO NOT MERGE
 2013-09-25 09:26:25 -07:00
Baligh Uddin
4b896df2a2 am 88421cc4: (-s ours) am 46485d6d: (-s ours) Import translations. DO NOT MERGE 
* commit '88421cc4940879dee64635e724925966572808ed':
  Import translations. DO NOT MERGE
 2013-09-25 09:26:22 -07:00
Baligh Uddin
39d07b2748 am 1b87107b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '1b87107bb37be580888f1617d047ca9009c18a7f':
  Import translations. DO NOT MERGE
 2013-09-25 09:23:24 -07:00
Baligh Uddin
721e53e86b am 99296322: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '99296322bc5ae3aabf89bd2b424492ec93b35c1a':
  Import translations. DO NOT MERGE
 2013-09-25 09:23:21 -07:00
Baligh Uddin
467b5bee65 am cb94b3ee: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'cb94b3ee54df1485cc6a0757d91f0af01651fa1a':
  Import translations. DO NOT MERGE
 2013-09-25 09:23:18 -07:00
Baligh Uddin
6ba2654794 am 9832b08a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '9832b08a49adaee5c3bb7c51ce0f6db78ccf11e2':
  Import translations. DO NOT MERGE
 2013-09-25 09:23:15 -07:00
Baligh Uddin
f7710ea932 am c8321a59: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'c8321a59a30b9fd5d3adfde30e95a9a827f4f554':
  Import translations. DO NOT MERGE
 2013-09-25 09:23:12 -07:00
Baligh Uddin
88421cc494 am 46485d6d: (-s ours) Import translations. DO NOT MERGE 
* commit '46485d6df60e11d04d976bc7ec5c9c8cdec14900':
  Import translations. DO NOT MERGE
 2013-09-25 09:23:09 -07:00
Baligh Uddin
1b87107bb3 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-25 16:19:07 +00:00
Baligh Uddin
99296322bc Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-25 16:18:59 +00:00
Baligh Uddin
cb94b3ee54 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-25 16:18:50 +00:00
Baligh Uddin
9832b08a49 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-25 16:18:39 +00:00
Baligh Uddin
c8321a59a3 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-25 16:18:14 +00:00
Baligh Uddin
18b7abffef Import translations. DO NOT MERGE 
Change-Id: Id86ce8166f481fa6a360ebb479f2e420ead1ee15
Auto-generated-cl: translation import
 2013-09-25 09:13:10 -07:00
Baligh Uddin
6cdfb390b0 Import translations. DO NOT MERGE 
Change-Id: Iea99a461037b5ef6dc3cd573b594b483692222ef
Auto-generated-cl: translation import
 2013-09-25 09:11:27 -07:00
Baligh Uddin
86d7136377 Import translations. DO NOT MERGE 
Change-Id: Ifaa3920e5a0d002b7bdb9eb668acf5cbc36729fc
Auto-generated-cl: translation import
 2013-09-25 09:07:42 -07:00
Baligh Uddin
a529729f2c Import translations. DO NOT MERGE 
Change-Id: If20827776d647c8120b53065eb304b7d01409cd6
Auto-generated-cl: translation import
 2013-09-25 09:06:40 -07:00
Baligh Uddin
916dc3dcae Import translations. DO NOT MERGE 
Change-Id: I16a7cfc8d9c5926a40a4ddca551f4281accb415f
Auto-generated-cl: translation import
 2013-09-25 08:43:59 -07:00
Baligh Uddin
46485d6df6 Import translations. DO NOT MERGE 
Change-Id: Id5391f651538cc46ad7455dedaa3426e29efc9c9
Auto-generated-cl: translation import
 2013-09-25 08:42:54 -07:00
Jean Chalard
65e1772d6b am 424054ba: am 6a1e32ef: Merge "Don\'t change the text in reaction to a user dict add" into klp-dev 
* commit '424054ba621738452b0bae69dcd6a8372ca5c273':
  Don't change the text in reaction to a user dict add
 2013-09-25 08:17:41 -07:00
Jean Chalard
424054ba62 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
 2013-09-25 08:11:31 -07:00
Przemyslaw Szczepaniak
58f1665372 Catch MissingResourceException caused by bad locale in TTS. 
Malformed locale objects will throw MissingResourceException
from getISO3Country() and getISO3Language() methods.

This change guard against the case where device default locale is
malformed and user tries to get TTS default locale (b/10814409)
and case where user tries to pass bad locale as argument to
TextToSpeech.getFeatures method (b/10494193).

Bug:10494193,10814409
Change-Id: Ie54d5d30bb042324da0c0d19b77c3a932c5642f7
 2013-09-25 10:01:27 +00:00
Jean Chalard
6a1e32efb6 Merge "Don't change the text in reaction to a user dict add" into klp-dev 2013-09-25 07:50:15 +00:00
Christopher Tate
23051cac04 am 6098618d: am 044fd573: Merge "Don\'t crash when no alarms are scheduled" into klp-dev 
* commit '6098618d8ebabd06b8d1eb8e8fceb60ec68839ed':
  Don't crash when no alarms are scheduled
 2013-09-24 18:25:06 -07:00
Christopher Tate
6098618d8e am 044fd573: Merge "Don\'t crash when no alarms are scheduled" into klp-dev 
* commit '044fd573ce58142309f9fc503cf5d52af447d082':
  Don't crash when no alarms are scheduled
 2013-09-24 18:23:16 -07:00
Christopher Tate
044fd573ce Merge "Don't crash when no alarms are scheduled" into klp-dev 2013-09-25 01:20:38 +00:00
Elliott Hughes
a4fbd6ddca am e713f57a: am d82b1c3b: am 9d8721f8: Merge "Remove dead code." 
* commit 'e713f57a6ebbeb6571226422c42c2c3d6c113a9a':
  Remove dead code.
 2013-09-24 17:56:15 -07:00
Elliott Hughes
e713f57a6e am d82b1c3b: am 9d8721f8: Merge "Remove dead code." 
* commit 'd82b1c3bf2abbc1582c90362267650cf05d38cd5':
  Remove dead code.
 2013-09-24 17:54:42 -07:00
Elliott Hughes
d82b1c3bf2 am 9d8721f8: Merge "Remove dead code." 
* commit '9d8721f8abb018429e3dba2296bce789b776aa0c':
  Remove dead code.
 2013-09-24 17:51:58 -07:00
Elliott Hughes
9d8721f8ab Merge "Remove dead code." 2013-09-25 00:47:54 +00:00
Vinit Deshapnde
6029611e3a 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
 2013-09-24 17:38:09 -07:00
Craig Mautner
e4a0bf8dba am f77c1eb1: am 8488f9fa: Merge "Be less aggressive when not resuming top activity" into klp-dev 
* commit 'f77c1eb1e0160364bb23972238952ee4f7b08c29':
  Be less aggressive when not resuming top activity
 2013-09-24 17:36:56 -07:00
Craig Mautner
f77c1eb1e0 am 8488f9fa: Merge "Be less aggressive when not resuming top activity" into klp-dev 
* commit '8488f9fa2e38e75e7ecbaac7d776900f8f1e5917':
  Be less aggressive when not resuming top activity
 2013-09-24 17:31:57 -07:00
Jason Sams
f684b81580 Merge "Remove hidden API setSurfaceTexture." 2013-09-25 00:29:32 +00:00
Craig Mautner
8488f9fa2e Merge "Be less aggressive when not resuming top activity" into klp-dev 2013-09-25 00:28:20 +00:00
Elliott Hughes
4b395a3625 Remove dead code. 
This hasn't been used since at least 2011, and we're no longer
shipping the data supporting it either.

Change-Id: Ibe42057650b49794c65d6f0d54ed7a492f3b594b
 2013-09-24 17:22:11 -07:00
Christopher Tate
6578ad17ca Don't crash when no alarms are scheduled 
Backing until you hear glass is generally contraindicated.

Bug 10056484

Change-Id: Ie1331fbbc5fbb5d6384a6cfc975aa1840a5c9a2d
 2013-09-24 17:12:46 -07:00
Jean-Michel Trivi
8a7ae6708d am 6dda4984: am 80e8a28c: Merge "Fix artwork not received in RemoteController metadata update." into klp-dev 
* commit '6dda4984cf636c2804ee6c6b109bcbb69d4baa04':
  Fix artwork not received in RemoteController metadata update.
 2013-09-24 16:42:49 -07:00
Jean-Michel Trivi
6dda4984cf am 80e8a28c: Merge "Fix artwork not received in RemoteController metadata update." into klp-dev 
* commit '80e8a28c339e88b59b681eff20d5438526d6b699':
  Fix artwork not received in RemoteController metadata update.
 2013-09-24 16:40:03 -07:00
Jean-Michel Trivi
80e8a28c33 Merge "Fix artwork not received in RemoteController metadata update." into klp-dev 2013-09-24 23:37:22 +00:00
Fabrice Di Meglio
c6afe76dfe Decouple CalendarView code 
- introduce a CalendarViewDelegate interface to be able to have several
CalendarView implementations
- code refactoring

Change-Id: Ib98fc51471c33a86ef58210e06176a4b4d253f01
 2013-09-24 16:25:57 -07:00
Craig Mautner
6ff6d010d1 Be less aggressive when not resuming top activity 
The previous fix for keeping activities from running on startup,
ag/363992, was keeping the home task from launching when the
keyguard should have allowed it.

This fix permits the home activity to launch in such situations.

Fixes bug 10916877.

Change-Id: I429f0d5a13e06a247b9b6b7241f9a3514044c371
 2013-09-24 16:21:54 -07:00
Svetoslav
62034df44d am de31fbe0: am b55afe8b: Merge "User should not be able to select unavailable printers." into klp-dev 
* commit 'de31fbe04a75d9a8c3c163fbebeacd052ce54e72':
  User should not be able to select unavailable printers.
 2013-09-24 16:21:31 -07:00
Svetoslav
de31fbe04a am b55afe8b: Merge "User should not be able to select unavailable printers." into klp-dev 
* commit 'b55afe8b835da2d0ebe596877bf93076e4726724':
  User should not be able to select unavailable printers.
 2013-09-24 16:17:43 -07:00
Svetoslav
b55afe8b83 Merge "User should not be able to select unavailable printers." into klp-dev 2013-09-24 23:15:58 +00:00