Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
157,437 Commits 3 Branches 0 Tags
e14facba6da1e393a1cb5e26ebc4e8c1fcbd73d0
Commit Graph

44717 Commits

Author SHA1 Message Date
Igor Murashkin
e14facba6d am ba164dfb: Merge "camera2: Fix race conditions and deadlocks around configuration" into lmp-dev 
* commit 'ba164dfbcab8d1358075e18199b3ef55f85c8b88':
  camera2: Fix race conditions and deadlocks around configuration
 2014-09-26 22:29:20 +00:00
Igor Murashkin
381d22f706 Merge "camera2: Fix race conditions and deadlocks around configuration" into lmp-dev 2014-09-26 22:20:12 +00:00
Fabrice Di Meglio
558e64b39f am 8420a924: Merge "Fix bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev 
* commit '8420a924e038948e5df6ab41b4fbc73ae16c67b4':
  Fix bug #17521147 Settings activity looks terrible on Volantis
 2014-09-26 21:58:08 +00:00
Dianne Hackborn
c29de2ffb2 am 45245d61: Merge "Fix issue #17671802: "content" command always prints..." into lmp-dev 
* commit '45245d6117ae484bb84d9afa3fbda36d59886059':
  Fix issue #17671802: "content" command always prints...
 2014-09-26 21:57:49 +00:00
Fabrice Di Meglio
6b0a880e13 Merge "Fix bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev 2014-09-26 20:52:02 +00:00
Fabrice Di Meglio
b22be6fcf2 Fix bug #17521147 Settings activity looks terrible on Volantis 
- update layouts for PreferenceActivity and its headers
in two panes mode (per UX request)
- add theming where it was missing

Change-Id: I0c478c1a66b6de7e122b7ee73da24f3dd5a7bc28
 2014-09-26 13:38:12 -07:00
Dianne Hackborn
192554b59b Merge "Fix issue #17671802: "content" command always prints..." into lmp-dev 2014-09-26 20:06:02 +00:00
Martijn Coenen
d1398c5eda am d846490a: Merge "Add hidden API to disable NFC (optional persist)." into lmp-dev 
* commit 'd846490a560122f9dd67d863da9ebddf81e15ba2':
  Add hidden API to disable NFC (optional persist).
 2014-09-26 19:43:58 +00:00
Jorim Jaggi
2ef12e4a5c am 9b20e012: Merge "Don\'t preload task description icons when opening recents" into lmp-dev 
* commit '9b20e0125f1ef129a719834874262574a2a0db9a':
  Don't preload task description icons when opening recents
 2014-09-26 19:43:50 +00:00
Raph Levien
5d8fa6c173 am a3e8bd63: Merge "Defer spelling correction with apostrophe" into lmp-dev 
* commit 'a3e8bd63d0d6640b9073b5617c76e1d890a29fcb':
  Defer spelling correction with apostrophe
 2014-09-26 19:43:41 +00:00
Dianne Hackborn
2f1993ec46 Fix issue #17671802: "content" command always prints... 
..."uid 2000 does not have android.permission.UPDATE_DEVICE_STATS"

Make sure to clear calling identity before getting into the guts
of the activity manager.  Also fix the places the activity manager
calls in to battery stats to not require a permission check, anyway.

Change-Id: Ifd90937875b9fe0c36aa3f5cf1ec173746914e6b
 2014-09-26 11:28:01 -07:00
Martijn Coenen
0a094c61bc Merge "Add hidden API to disable NFC (optional persist)." into lmp-dev 2014-09-26 18:08:31 +00:00
Jorim Jaggi
e51b21a81e Merge "Don't preload task description icons when opening recents" into lmp-dev 2014-09-26 17:57:05 +00:00
Raph Levien
c8ffeeca67 Merge "Defer spelling correction with apostrophe" into lmp-dev 2014-09-26 17:12:49 +00:00
Jorim Jaggi
bdd4b201e4 Don't preload task description icons when opening recents 
Bug: 17624331
Change-Id: I55a1184efd5982122f87fab99a5402336b380d7c
 2014-09-26 19:00:05 +02:00
Raph Levien
b1fef1114e Defer spelling correction with apostrophe 
When typing a contraction (such as "doesn't") we don't want a spell
right after the apostrophe, as this will create a false temporary red
underline, and the span split also breaks a kern pair causing text to
shift. This patch detects the case where the cursor is immediately after
such a word and suppresses correction in that case.

Bug: 17641350

Change-Id: I4d09576a31df551c96f820242fd2cbc675506dae
 2014-09-26 08:59:28 -07:00
Philip Nowell
af9152a557 am 571730b4: Merge "Corrects a typo that identified XXXHIGH as 560 dpi instead of 640." into lmp-dev 
* commit '571730b4d1a438fadfdb2c6951483f00f6276518':
  Corrects a typo that identified XXXHIGH as 560 dpi instead of 640.
 2014-09-26 15:09:39 +00:00
Philip Nowell
31a141af13 Merge "Corrects a typo that identified XXXHIGH as 560 dpi instead of 640." into lmp-dev 2014-09-26 15:00:22 +00:00
Przemyslaw Szczepaniak
c1139b3e3f am f0a7c767: Merge "Fix ambiguous TTS#playSilence method." into lmp-dev 
* commit 'f0a7c7672f158bc85ce400c1f59ec7fd973855d2':
  Fix ambiguous TTS#playSilence method.
 2014-09-26 09:17:05 +00:00
Przemyslaw Szczepaniak
759962ab6d Merge "Fix ambiguous TTS#playSilence method." into lmp-dev 2014-09-26 08:11:23 +00:00
Svetoslav
e86737947a am 9ec435dc: Merge "Using wrong virtual view id When prefetching accessibility nodes." into lmp-dev 
* commit '9ec435dca7296db68b19e03300ff814e34f84c16':
  Using wrong virtual view id When prefetching accessibility nodes.
 2014-09-26 02:00:18 +00:00
Svetoslav
a8181a9a0b Merge "Using wrong virtual view id When prefetching accessibility nodes." into lmp-dev 2014-09-26 01:51:54 +00:00
Svetoslav
c569d35945 Using wrong virtual view id When prefetching accessibility nodes. 
When getting an accessibility node info we also prefetch its predecessors,
siblings and descendants up to fifty. If a view has a node provider, i.e.
virtual descendants, and the id of the virtual descendant is not specified
we use a speacial constant to refer that the provider should create a node
for its hosting view. The bug was that we were not using the correct constant
when calling into the provider.

bug:17664111

Change-Id: I4f6b2333e1e7e3e2bb6b164c0752613417c60d16
 2014-09-25 18:46:33 -07:00
Dianne Hackborn
042b32c8d2 am 0b1eb9d4: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '0b1eb9d4ae339629fbbf226160896a917cad4d0d':
  Work on issue #17656716: Unhandled exception in Window Manager
 2014-09-26 01:24:14 +00:00
Alan Viverette
10db809f24 am a9ac89a3: Merge "Correctly advertise accessibility scrolling actions" into lmp-dev 
* commit 'a9ac89a3fa9291553edb72f4557dcff9e77863ae':
  Correctly advertise accessibility scrolling actions
 2014-09-26 01:24:10 +00:00
Dianne Hackborn
a7b1595c25 Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 2014-09-26 01:15:02 +00:00
Alan Viverette
80c0bbe82c Merge "Correctly advertise accessibility scrolling actions" into lmp-dev 2014-09-26 01:13:13 +00:00
Martijn Coenen
56a3e67433 Add hidden API to disable NFC (optional persist). 
Bug: 17298769
Change-Id: I1fa59592a34f1207731dc75d2e548b3e614d94f5
 2014-09-25 18:02:27 -07:00
Philip Nowell
d561913798 Corrects a typo that identified XXXHIGH as 560 dpi instead of 640. 
Change-Id: I8b5ac84431d378f0e43be8d19920fd6ba335ebc6
 2014-09-26 00:54:32 +00:00
Dianne Hackborn
017c6a28be Work on issue #17656716: Unhandled exception in Window Manager 
Create descriptive errors when sending unreasonably large
parcels through IPC.

Change-Id: Ie93b5372a8ed87541db282876c4eeeae69a1e8bd
 2014-09-25 17:48:44 -07:00
Adam Powell
9cd82d061a am da7f9bab: Merge "Always show the name of the last used Home app in ResolverActivity" into lmp-dev 
* commit 'da7f9bab0206c237f3d70b3b23eeaab41f478eb1':
  Always show the name of the last used Home app in ResolverActivity
 2014-09-26 00:16:41 +00:00
Igor Murashkin
51dcfd65a6 camera2: Fix race conditions and deadlocks around configuration 
Fixes an illegal state exception that sometimes occurs during
configuration. Fixes a deadlock during unconfiguration. Fixes
the idle handler never being run during configuration.

Bug: 17628736
Change-Id: Id2c5e416f96fcbac9c718fca3cc2cf21734bc6a4
 2014-09-25 16:57:18 -07:00
Adam Powell
a35c77aea6 Always show the name of the last used Home app in ResolverActivity 
Bug 17629220

Change-Id: Ia1d0a188f8c0911e5b74b18ba44508a6e2139d0c
 2014-09-25 16:54:41 -07:00
Adrian Roos
40c632b931 am 05ade73e: Merge "Ensure that setting an empty password clears it" into lmp-dev 
* commit '05ade73e580b826ead839d3c5db508a8ea25ad93':
  Ensure that setting an empty password clears it
 2014-09-25 23:44:18 +00:00
Eino-Ville Talvala
ed5e8d8ce3 am 7b6a4acd: Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev 
* commit '7b6a4acdeb6bddbb6b058c227e037c714dd8f2b8':
  Camera2 Legacy: Clear JPEG ids when reconfiguring.
 2014-09-25 23:44:14 +00:00
Michael Wright
99ef41c47c am 233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev 
* commit '233bbabfe10bbf7190cdf3a6bb44f081a1fa91c7':
  Specify a device identifier for keyboard layout notification.
 2014-09-25 23:44:08 +00:00
Adrian Roos
625e8f5959 Merge "Ensure that setting an empty password clears it" into lmp-dev 2014-09-25 22:42:43 +00:00
Eino-Ville Talvala
c2c520950a Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev 2014-09-25 22:36:59 +00:00
Michael Wright
42dad80418 Merge "Specify a device identifier for keyboard layout notification." into lmp-dev 2014-09-25 22:18:20 +00:00
Eino-Ville Talvala
77fe9eddeb am 93f0b612: Camera2 legacy: Improve robustness to camera service crashes 
* commit '93f0b612350e217b8434a0199ba4723c2cfe0e72':
  Camera2 legacy: Improve robustness to camera service crashes
 2014-09-25 21:35:15 +00:00
Eino-Ville Talvala
52571b9032 Camera2 Legacy: Clear JPEG ids when reconfiguring. 
Otherwise, stale IDs for old streams will be left around, causing
JPEGs to be sent to the wrong consumers.

Bug: 17659125
Change-Id: I98e1a1d389147631bc80eaeb10d57f74a6256f32
 2014-09-25 14:06:55 -07:00
Eino-Ville Talvala
eecc904f13 Camera2 legacy: Improve robustness to camera service crashes 
When the camera service dies, the getParameters call is often the first
to fail, and on legacy mode, this frequently happens in a background thread.
Catch the runtime exceptions and convert to device errors, instead of killing
the process.

Bug: 17587496

Change-Id: I6757961e7c0387defd368a13cb7c343950602400
 2014-09-25 14:06:55 -07:00
Alan Viverette
947a969560 Correctly advertise accessibility scrolling actions 
Previously, we didn't take into account partially-visible views. This
extracts existing logic for determining whether the list can scroll
up or down and applies that when adding scrolling actions.

BUG: 17648502
Change-Id: I7ed9382e1645970ab098c210ad10f8a077da834b
 2014-09-25 12:43:47 -07:00
Ruben Brunk
26a809b595 am e76ce25f: Merge "camera2: Fix null check in PictureCallback." into lmp-dev 
* commit 'e76ce25ff342d393ffb79ef7e01b09cae5320a73':
  camera2: Fix null check in PictureCallback.
 2014-09-25 19:33:18 +00:00
Ruben Brunk
820a08a555 Merge "camera2: Fix null check in PictureCallback." into lmp-dev 2014-09-25 19:23:00 +00:00
Ruben Brunk
2c3d7c5f68 camera2: Fix null check in PictureCallback. 
Bug: 17636586
Change-Id: Ieddc106e14c97dc78405821e83e346d626127e2c
 2014-09-25 11:48:27 -07:00
Paul Lawrence
f0eed92b04 am 56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-dev 
* commit '56a38862d68c3160ae9b049ca89422cc5834e8e3':
  Fix pause when setting pin/pattern/password
 2014-09-25 18:46:17 +00:00
Paul Lawrence
3a5a0be61e Fix pause when setting pin/pattern/password 
Move setting encryption pin/pattern/password into a separate thread

Bug: 17554587
Change-Id: Ifdf2ed5aa9ca08d68bb2ed08c8985203c24dcb9f
 2014-09-25 17:32:19 +00:00
Chris Wren
7b5305ea3b am 15653a91: Merge "getCurrentInterruptionFilter should return the filter value, not the hints." into lmp-dev 
* commit '15653a918f6c1747d08f03e8241368bbbcc38fe6':
  getCurrentInterruptionFilter should return the filter value, not the hints.
 2014-09-25 17:29:59 +00:00
Chris Wren
b698185929 Merge "getCurrentInterruptionFilter should return the filter value, not the hints." into lmp-dev 2014-09-25 17:21:32 +00:00