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

105211 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
b35fbd5720 am 740cf4ec: am bb7b315c: Merge "add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}()" into jb-mr2-dev 
* commit '740cf4ec31b8d7363c9a0f839afda3d8cb0ab9a3':
  add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}()
 2013-04-17 18:36:08 -07:00
Eino-Ville Talvala
7005b67c12 Camera: Add hidden camera preview to renderscript allocation API 
- Camera.createPreviewAllocation() creates YUV allocations for use as
  a preview buffer destination.

- Camera.setPreviewCallbackAllocation() sets such an allocation as the
  target for preview data from camera.

Bug: 8563840
Change-Id: Ie42033976fed825d396550bbc033d434c8206b6b
 2013-04-17 18:35:26 -07:00
Mathias Agopian
740cf4ec31 am bb7b315c: Merge "add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}()" into jb-mr2-dev 
* commit 'bb7b315cdd48fdcffc07d0e98557cb88b9f58006':
  add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}()
 2013-04-17 18:32:24 -07:00
Mathias Agopian
bb7b315cdd Merge "add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}()" into jb-mr2-dev 2013-04-18 01:29:07 +00:00
Dianne Hackborn
ca46b87118 Fix issue #8540550: Screenshots should never have transparency 
Make sure the thumbnail bitmap is initialized with a black
background.

Change-Id: I87c00d309b7d30b6085a751aa4ae22cf146c74f5
 2013-04-17 18:06:22 -07:00
Michael Wright
f9c2ada62f Standardize gamepad layouts on existing controllers 
Bug: 8292749
Change-Id: I24bae8c9229125fcdd583d74b29f4334ddff782e
 2013-04-17 18:00:06 -07:00
Chris Craik
181e3cb37c am 9b9fe68e: am 18455c30: Merge "Add input/output JSON data for baseline comparison" into jb-mr2-dev 
* commit '9b9fe68ea3117041e570ca158d61201acefb0d8f':
  Add input/output JSON data for baseline comparison
 2013-04-17 17:38:36 -07:00
Chris Craik
9b9fe68ea3 am 18455c30: Merge "Add input/output JSON data for baseline comparison" into jb-mr2-dev 
* commit '18455c307d8ea439dbf78aa3789380259ddd8572':
  Add input/output JSON data for baseline comparison
 2013-04-17 17:34:46 -07:00
Benoit Goby
29a4b7277e Fix UsbDebuggingActivity not shown in adb tcpip mode 
Bug: 8646772
Change-Id: If34c756bece903a0a452070bbc94ebc71d325bf6
 2013-04-17 17:34:30 -07:00
Chris Craik
18455c307d Merge "Add input/output JSON data for baseline comparison" into jb-mr2-dev 2013-04-18 00:32:08 +00:00
Eric Laurent
c18c9138ce AudioService: SCO audio backward compatibility 
After commit 25fc29b3, AudioManager.startBluetoothSco()
does not use virtual voice call mode anymore when starting the
SCO audio connection to the headset.
To help backward compatibility, this change makes that virtual voice call
is used if the request comes from an application targeting a SDK version
before JB MR2. For applications targeted to JB MR2 and above a raw SCO
audio connection is established.

Bug 8157702

Change-Id: If1ded2fd99b7ed76d2435d95ee03659e78a7882a
 2013-04-17 17:19:56 -07:00
Jeff Brown
c82c89edc7 Add a config resource to force HDMI rotation on some devices. 
If the hardware composer HAL does not provide full support for
multiple displays, it may be necessary to force the HDMI rotation
when not docked.  (When docked, we can use the dock's orientation.)

This configuration is not expected to be used on newer devices
with the requisite HAL support and may be removed in the future.

Bug: 8511721
Change-Id: I1ff50f00ee7fe621aceff94bd938ecf6385c3f38
 2013-04-17 17:18:15 -07:00
Jeff Tinker
f7568b5ee9 Improve error handling for DRM errors reported by plugins 
Change-Id: I25df78f16379b32c54189949daa3ab9c91187375
related-to-bug: 8621516
 2013-04-17 16:46:49 -07:00
Wink Saville
e3a9cbc052 Add CellInfoWcdma and related classes. 
Update javadoc's to define invalid values are Integer.MAX_VALUE.

Bug: 8622081
Change-Id: I513a67d4b46b72f03e0c3360abcc0ad5222c1c13
 2013-04-17 16:40:17 -07:00
Jim Miller
9b4b662c27 resolved conflicts for merge of 6825c478 to master 
Change-Id: Id9657db0b3623c329ae2cff3916c2d0eb4301dd7
 2013-04-17 16:27:30 -07:00
Chet Haase
68293ecb91 am 78296cb7: am bc09a364: Merge "Fixes for setClipBounds()" into jb-mr2-dev 
* commit '78296cb760bff8bf951e88d6f4ec9a6ff3059406':
  Fixes for setClipBounds()
 2013-04-17 15:54:52 -07:00
Jim Miller
6825c47830 am 9bf7be93: Merge "Add permission check for owner-info related LockSettings." into jb-mr2-dev 
* commit '9bf7be933d039ef227ca54f917c1ff6a00a2f833':
  Add permission check for owner-info related LockSettings.
 2013-04-17 15:49:23 -07:00
Chet Haase
78296cb760 am bc09a364: Merge "Fixes for setClipBounds()" into jb-mr2-dev 
* commit 'bc09a364c3fd49470b936e7bc2521f6de9ba07b4':
  Fixes for setClipBounds()
 2013-04-17 15:49:17 -07:00
Jim Miller
9bf7be933d Merge "Add permission check for owner-info related LockSettings." into jb-mr2-dev 2013-04-17 22:47:06 +00:00
Craig Mautner
61cc1b632a Merge "Steady improvement to multi stack." 2013-04-17 22:35:02 +00:00
Jim Miller
158fe19ff8 Add permission check for owner-info related LockSettings. 
Fixes bug 8512972

Change-Id: I372ef892000e5de9075783f06b722e2911cfc90d
 2013-04-17 15:26:10 -07:00
Jeff Tinker
e1c76bebef Make MediaDrm APIs public 
bug: 8603279

Change-Id: I9fab2673867ad413a084933cee7239d13e8b7893
 2013-04-17 15:24:48 -07:00
Chet Haase
bc09a364c3 Merge "Fixes for setClipBounds()" into jb-mr2-dev 2013-04-17 22:13:50 +00:00
Mathias Agopian
9ddf32aa8a add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}() 
Bug: 8593591
Change-Id: I152281ddca8716aee97147cb1b3fb483ed46b053
 2013-04-17 15:04:47 -07:00
Jean-Michel Trivi
d5e1495723 am aa4e2462: am e1546df2: Merge "Fix message handling in RemoteControlClient" into jb-mr2-dev 
* commit 'aa4e246271fa837c373b71fbaa671f0cbc336eca':
  Fix message handling in RemoteControlClient
 2013-04-17 14:23:06 -07:00
Adam Cohen
c283277551 am f4865efe: am be8bc839: Merge "DO NOT MERGE Stripping some new widget API that is yet unused" into jb-mr2-dev 
* commit 'f4865efe603e795bc037f5df468556140165eea2':
  DO NOT MERGE Stripping some new widget API that is yet unused
 2013-04-17 14:23:01 -07:00
Jim Miller
3569e9e50c resolved conflicts for merge of 2f6a2526 to master 
Change-Id: Ie51d3a63f4d4d5bad7ef16ad84ef6ad5acdaa64a
 2013-04-17 14:18:56 -07:00
Jean-Michel Trivi
aa4e246271 am e1546df2: Merge "Fix message handling in RemoteControlClient" into jb-mr2-dev 
* commit 'e1546df25a7de17195f5b38ca90cad8447c288d0':
  Fix message handling in RemoteControlClient
 2013-04-17 14:15:36 -07:00
Jean-Michel Trivi
e1546df25a Merge "Fix message handling in RemoteControlClient" into jb-mr2-dev 2013-04-17 21:09:44 +00:00
Adam Cohen
f4865efe60 am be8bc839: Merge "DO NOT MERGE Stripping some new widget API that is yet unused" into jb-mr2-dev 
* commit 'be8bc8392e203a661242b0637ce25bd05c292306':
  DO NOT MERGE Stripping some new widget API that is yet unused
 2013-04-17 14:06:33 -07:00
Adam Cohen
be8bc8392e Merge "DO NOT MERGE Stripping some new widget API that is yet unused" into jb-mr2-dev 2013-04-17 21:03:43 +00:00
Craig Mautner
29219d963d Steady improvement to multi stack. 
- Fix back button behavior with two stacks. Stopping activities were
held in that state indefinitely. This change causes IDLE_NOW_MSG to
be sent immediately for the last activity in a stack.

- Touch in non-focused stack was being ignored because of focus tests
in AbsListView.

- Change the focused stack when the activity focus changes. Renamed
mMainStack to mFocusedStack to reflect this.

- Resume all top stack activities when resuming.

- Assign intent task to ActivityRecord if it doesn't have a task.
Fixes bug 8433463.

Change-Id: I8d3c806234511697bc209ab99890730ffa514d20
 2013-04-17 13:54:48 -07:00
Adam Cohen
33f3aab220 DO NOT MERGE Stripping some new widget API that is yet unused 
Change-Id: I7a7156f30aa9105461908f66426950d13eb01408
 2013-04-17 13:48:45 -07:00
Jim Miller
2f6a2526db am b1e5137a: Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev 
* commit 'b1e5137a807d19a9cbc241c0ba84c3c49b32fceb':
  Move owner info from Settings.Secure to LockSettings
 2013-04-17 13:44:23 -07:00
Jim Miller
b1e5137a80 Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev 2013-04-17 20:39:58 +00:00
Amith Yamasani
c1ce6e1a79 am ac16c21d: am a0042742: Merge "Modify restrictions bundle per api council recommendations" into jb-mr2-dev 
* commit 'ac16c21d11c1545efb8deafbcb7c120a5e0821a1':
  Modify restrictions bundle per api council recommendations
 2013-04-17 11:34:28 -07:00
Dianne Hackborn
2590a8b341 am bc463ea1: am e8d12dd6: Merge "Fix issue #8032572: Android app permission help text "null"..." into jb-mr2-dev 
* commit 'bc463ea1c5fa9c80fa06183a82fdd1acfb5289e5':
  Fix issue #8032572: Android app permission help text "null"...
 2013-04-17 11:30:50 -07:00
Amith Yamasani
ac16c21d11 am a0042742: Merge "Modify restrictions bundle per api council recommendations" into jb-mr2-dev 
* commit 'a0042742c8941519718cc8872a84cfec10294386':
  Modify restrictions bundle per api council recommendations
 2013-04-17 11:30:41 -07:00
Amith Yamasani
a0042742c8 Merge "Modify restrictions bundle per api council recommendations" into jb-mr2-dev 2013-04-17 18:26:49 +00:00
Dianne Hackborn
bc463ea1c5 am e8d12dd6: Merge "Fix issue #8032572: Android app permission help text "null"..." into jb-mr2-dev 
* commit 'e8d12dd6b08ec5b3f2a18bee14171079c6c27e0d':
  Fix issue #8032572: Android app permission help text "null"...
 2013-04-17 11:26:05 -07:00
Dianne Hackborn
e8d12dd6b0 Merge "Fix issue #8032572: Android app permission help text "null"..." into jb-mr2-dev 2013-04-17 18:21:04 +00:00
Dianne Hackborn
84c7111c4b Fix issue #8032572: Android app permission help text "null"... 
...for "Microphone / Record audio"

Change-Id: Ie839b055771950e1078fa66506a007203338cfb5
 2013-04-17 11:18:10 -07:00
Christopher Tate
a952f9d590 am 0bd7a2f2: am effb153a: Merge "Lengthen the AM timeout reading crash reports slightly" into jb-mr2-dev 
* commit '0bd7a2f27120e945376217e2300ac2cd8bb00059':
  Lengthen the AM timeout reading crash reports slightly
 2013-04-17 11:13:29 -07:00
Christopher Tate
0bd7a2f271 am effb153a: Merge "Lengthen the AM timeout reading crash reports slightly" into jb-mr2-dev 
* commit 'effb153abaf57023382a7cb0cd64215f1db2992c':
  Lengthen the AM timeout reading crash reports slightly
 2013-04-17 11:11:30 -07:00
Christopher Tate
effb153aba Merge "Lengthen the AM timeout reading crash reports slightly" into jb-mr2-dev 2013-04-17 18:08:19 +00:00
Amith Yamasani
7e99bc02c8 Modify restrictions bundle per api council recommendations 
Use a Bundle for persisting and passing to the application, but use a
list to return data back from an application that's exposing restrictions.

Changed the xml reading/writing code to store the value type in the Bundle
so that it can be reproduced when reading. Earlier we were assuming only
String and String[].

Bug: 8633967

Change-Id: I523d5553728edcf28a1e9d432f490b4956f34215
 2013-04-17 10:44:44 -07:00
Victoria Lease
87d591d59f Merge "resolved conflicts for merge of 6c18e2c8 to master" 2013-04-17 17:42:15 +00:00
Christopher Tate
1b64598602 Lengthen the AM timeout reading crash reports slightly 
We're missing some (small fraction of) native crash reports from
debuggerd.  It looks like under high system load the debuggerd
reporting code just isn't quite timely enough for the very short
timeouts initially deployed, so lengthen those a bit.

Bug 8552010

Change-Id: Icbc5b6517de3bb98fff1af2ea42ffd208ef20412
 2013-04-17 10:40:02 -07:00
Victoria Lease
af1653a851 resolved conflicts for merge of 6c18e2c8 to master 
Change-Id: Idb4679247b201a1f453c63fee5b45b12b03a67a1
 2013-04-17 10:33:23 -07:00
Baligh Uddin
f2928665cf Merge "Import translations. DO NOT MERGE" 2013-04-17 17:18:27 +00:00