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

112043 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vinit Deshapnde
b481dae2f5 Merge "Fix invalid Wifi Network system crash" into klp-dev 2013-09-12 20:28:57 +00:00
Svetoslav
ef2088a26a Merge "Handle print serivce crashes." into klp-dev 2013-09-12 20:24:40 +00:00
David Christie
9e9ce92541 Don't track LocationManager internal requests in AppOps (b/10725757). 
AppOps stats are used to populate the "apps recently using location"
list in settings->location.  There is no reason to show Android OS
in that list simply because of internal location requests supporting
other clients.

Change-Id: I6908aa63deb19d22733b8d9cdae6ea5dbbea55e0
 2013-09-12 13:19:53 -07:00
Chet Haase
e850c973b0 Merge "Hide translucent activity conversion API" into klp-dev 2013-09-12 19:41:33 +00:00
Chet Haase
90b10f89d7 Merge "Fix TechChange's assumption about TextView targets" into klp-dev 2013-09-12 19:41:16 +00:00
Eino-Ville Talvala
2d861e87ae Merge "Camera2: Fix build: Add new key to API" into klp-dev 2013-09-12 19:06:55 +00:00
Eino-Ville Talvala
986b1bd73f Camera2: Fix build: Add new key to API 
Change-Id: Ie44a9e3b1c8d04dd266d39f59a5916ddaf5fca67
 2013-09-12 11:52:45 -07:00
Eino-Ville Talvala
184b17ddef Merge "Camera2: Add a missing key for controlling shading map mode" into klp-dev 2013-09-12 18:32:29 +00:00
Robert Greenwalt
8f435baca8 Merge "Fix Wifi Batch Scanning" into klp-dev 2013-09-12 18:22:28 +00:00
Igor Murashkin
6c62163976 Merge "camera_metadata: add android.lens.state MOVING enum value" into klp-dev 2013-09-12 18:21:15 +00:00
Chet Haase
8529b30b91 Fix TechChange's assumption about TextView targets 
Some of the code in the TextChange transition assumed that the
start values for a transition were for a TextView object. This may
not be the case, and we should return early (without creating an
animator) when it is not.

Issue #10725388 Frequent Framework crashes across apps

Change-Id: I6999eb2288f107f4b93ddb5b77cd068069d831ed
 2013-09-12 11:19:32 -07:00
Adam Powell
a2906cb4d9 Merge "Show alternate menu panel on devices with menu key" into klp-dev 2013-09-12 18:12:05 +00:00
Eino-Ville Talvala
d96748b02a Camera2: Add a missing key for controlling shading map mode 
Bug: 10726421
Change-Id: If41e00c921ab493c7427575258fed63cbbc22dc1
 2013-09-12 11:11:27 -07:00
Chet Haase
c0f652093e Merge "Add exclude() methods to Transition" into klp-dev 2013-09-12 18:07:40 +00:00
Vinit Deshapnde
074dc2eb2d Merge "Don't restore EAP-TLS networks from backup" into klp-dev 2013-09-12 17:53:39 +00:00
Joe Malin
204df6f06a am 7bf74bc0: am 1e3a0203: am 6f9e30e3: Merge "Android Training: Add Location Testing Lesson" into jb-mr2-docs 
* commit '7bf74bc04c4e6fa022a84a4e586aca43816ec1f9':
  Android Training: Add Location Testing Lesson
 2013-09-12 10:53:26 -07:00
Svetoslav
c6066799ad Handle print serivce crashes. 
1. Now after a print service crashes we are bringing it to the same
    state of its lifecycle. For example, if a service does a discovery
    and crashes we recreate the discovery session call the start
    discovery method and so on.

2. Turned off debugging logs since we have fully fledged state dump.

bug:10697779

Change-Id: Id790537461428e96b197eef12258996bda2bd1ce
 2013-09-12 10:52:26 -07:00
Joe Malin
7bf74bc04c am 1e3a0203: am 6f9e30e3: Merge "Android Training: Add Location Testing Lesson" into jb-mr2-docs 
* commit '1e3a02030949df8c1d1f37a37fc23f25357632f0':
  Android Training: Add Location Testing Lesson
 2013-09-12 10:51:12 -07:00
Joe Malin
1e3a020309 am 6f9e30e3: Merge "Android Training: Add Location Testing Lesson" into jb-mr2-docs 
* commit '6f9e30e3b76f564db3a56de24e4efdc5a64455f0':
  Android Training: Add Location Testing Lesson
 2013-09-12 10:48:38 -07:00
Joe Malin
6f9e30e3b7 Merge "Android Training: Add Location Testing Lesson" into jb-mr2-docs 2013-09-12 17:45:05 +00:00
Daniel Sandler
f3da15bde7 Merge "Remove spurious density-specific default wallpaper." into klp-dev 2013-09-12 17:35:53 +00:00
Joe Malin
72fdbc88bb Android Training: Add Location Testing Lesson 
Change-Id: I855e1c3dd0db65be7dc970437af2d52ccf836cb7
 2013-09-12 10:07:30 -07:00
Wink Saville
99e7847b76 Define config_volte_replacement_rat. 
Default value is 0 which means there is no replacement and
PhoneProxy#phoneObjectUpdater will not replace a VoLTE RAT.

Bug: 10673760
Change-Id: Ic77411b5da415c620fce5a185ca1d7542dfe3b7f
 2013-09-12 09:48:55 -07:00
Dirk Dougherty
16dae5997b am 834ba474: am 4c6cde54: am 89579294: Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs 
* commit '834ba47485a5fb55c89d8f22b826bdb26049f6d6':
  Pass whitelist of sample groups to doclava.
 2013-09-12 09:28:18 -07:00
Dirk Dougherty
834ba47485 am 4c6cde54: am 89579294: Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs 
* commit '4c6cde545c5d2e76d9ba8ef926399463369da7e7':
  Pass whitelist of sample groups to doclava.
 2013-09-12 09:22:20 -07:00
Dirk Dougherty
4c6cde545c am 89579294: Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs 
* commit '89579294ce0fbe728738fa09fb45cc53fd79bfb5':
  Pass whitelist of sample groups to doclava.
 2013-09-12 09:15:25 -07:00
John Spurlock
43c70b0ccf Merge "Status bar interaction veto revoked on ups/cancels." into klp-dev 2013-09-12 16:05:56 +00:00
Dirk Dougherty
89579294ce Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs 2013-09-12 16:01:52 +00:00
Jeff Sharkey
357f9e34ca Merge "Handle pipe thumbnails, acquire unstable refs." into klp-dev 2013-09-12 16:00:40 +00:00
John Spurlock
5fee8360f8 Status bar interaction veto revoked on ups/cancels. 
If we get an ACTION_UP or ACTION_CANCEL and the shade is not
expanded, treat this as a signal of !interacting, revoking
the interaction veto.

Bug:10711758
Change-Id: Ia69ff24880193fa8d99ece79053eeb95dfa9ba71
 2013-09-12 11:35:08 -04:00
Flavio Lerda
b25cfdf1ec Merge "Document the order of values returned by keyAt()." into klp-dev 2013-09-12 11:49:29 +00:00
Martijn Coenen
b523bfa64d Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE. 
Bug: 10722206
Change-Id: I8b672cd7b9015e1ec88af96ef1fd0774d20b8d17
 2013-09-12 13:44:39 +02:00
Jean Chalard
c743cb9477 Don't send the same values to onUpdateSelection repeatedly 
If the IME is repeatedly changing the text in its
onUpdateSelection handler, this will crash it with a
stack overflow exception. It's better than the old behavior,
which would result in a busyloop likely to make the
device completely unresponsive.

Bug: 10301239
Change-Id: I170cfb8ef20fc056d4725931890a987aefcaea8b
 2013-09-12 16:52:56 +09:00
Dirk Dougherty
a6c02679e1 Pass whitelist of sample groups to doclava. 
Change-Id: I36f3e3426115cc296531cf41d20ab07a4d429b19
 2013-09-12 00:37:50 -07:00
Daniel Sandler
0594b192cd Remove spurious density-specific default wallpaper. 
Bug: 10671611
Change-Id: I719bfb09cfd1cbc56f577cdcbf0a9945739355e2
 2013-09-12 01:18:55 -04:00
Igor Murashkin
9ea4ae67fb camera_metadata: add android.lens.state MOVING enum value 
Bug: 10621609
Change-Id: Ia4fa15db99350f920741f244ae7772520657fdd2
 2013-09-11 21:43:50 -07:00
Jeff Brown
737d2c0b92 Merge "Ignore ON_AFTER_RELEASE for partial wake locks." into klp-dev 2013-09-12 04:03:31 +00:00
Jeff Brown
fb07349c07 Make View onKeyUp symmetric with onKeyDown. 
Properly use KeyEvent.isConfirmKey() in both methods.

Change-Id: Id87158f2163f75af20350dc445df6a59f7190752
 2013-09-11 20:51:13 -07:00
Baligh Uddin
4dff98689d Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-12 02:46:12 +00:00
Baligh Uddin
c57bd8b996 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-12 02:45:52 +00:00
Baligh Uddin
0792054f6b Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-12 02:45:12 +00:00
Robert Greenwalt
126755cf41 Fix Wifi Batch Scanning 
Some parsing bugs, more debug logs, etc.

bug:9301872
Change-Id: I245ab00955e245be81a019750be0f8491aa505fd
 2013-09-11 19:31:20 -07:00
Adam Powell
5fcf5b9fd3 Show alternate menu panel on devices with menu key 
Provide a softer transition to the overflow-everywhere world for
devices with menu keys. The panel menu will still be used on these
devices in response to a menu key press even in the presence of an
action bar with overflow.

Fix a few lingering bugs around dispatching the open-overflow
transition that caused problems with this along the way.

Change-Id: I9d77c70f6d15c47160ac06292984101d619c44e6
 2013-09-11 19:17:38 -07:00
Alex Ray
c333a3f7c6 Merge "consumer_ir: add length to get carrier freqs" into klp-dev 2013-09-12 01:55:27 +00:00
Selim Gurun
e4fdc84794 Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev 2013-09-12 01:02:45 +00:00
Selim Gurun
41b9ef9c4e Revert "Add permissions for the InCallUI Split." 
This reverts commit 4f7ffa90d117e499786c77bccefdef88c1714668.

Change-Id: If07f7dd0b416c070398593e2d5a15b3557c1f323
 2013-09-12 00:57:34 +00:00
Alex Ray
03ad7ae1bc Merge "consumer ir: clarify @link in documentation" into klp-dev 2013-09-12 00:40:50 +00:00
Jeff Sharkey
de2b22fbc6 Handle pipe thumbnails, acquire unstable refs. 
Support decoding thumbnails delivered over pipes by wrapping in a
buffered stream.  Also switch to using unstable provider references
to avoid crashing DocumentsUI.

Bug: 10516148, 10510851
Change-Id: I85f6eeaca70c97742bf79656d1d0c6da381fdd47
 2013-09-11 17:33:52 -07:00
Xia Wang
b32a80425d Merge "Use setAirplaneMode() API for Connectivity Manager tests" into klp-dev 2013-09-12 00:24:31 +00:00
Lajos Molnar
03cd51cd17 Merge "MediaFormat.java: Add KEY_MAX_WIDTH and KEY_MAX_HEIGHT" into klp-dev 2013-09-12 00:19:17 +00:00