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

109289 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
1cf7b4a438 am d3ed45f8: am 991487c6: am 9a1f106d: am 34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev 
* commit 'd3ed45f841419b90e1d6813d9bcefbcb91554a63':
  fix typo in code sample
 2013-07-19 13:33:58 -07:00
Dirk Dougherty
46cc4dbb38 am e0380d8f: resolved conflics for merge of 54201120 to jb-mr2-dev 
* commit 'e0380d8fe675a1c1785cfd5d2b7f0c6b59c27c54':
  Doc change: Add Colopl video to carousel and spotlight.
 2013-07-19 13:33:46 -07:00
Robert Greenwalt
b5bf655cc6 am e874bd35: Merge "Add gservices updater for carrier provisioning url" into jb-mr2-dev 
* commit 'e874bd351f7b68cead889f55afba505fb5fac97c':
  Add gservices updater for carrier provisioning url
 2013-07-19 13:33:35 -07:00
Jean-Michel Trivi
f65c918984 am bbc9a62a: Cleaner Tejat notification in Audio Package 11 
* commit 'bbc9a62a71dd35c30eed96db9d4e23a754b55d8d':
  Cleaner Tejat notification in Audio Package 11
 2013-07-19 13:33:30 -07:00
Wink Saville
df43ba82e6 am e3badc10: Merge "When a SIM is changed check mobile provisioning." into jb-mr2-dev 
* commit 'e3badc10112b76db583736767849b2f82ae737fd':
  When a SIM is changed check mobile provisioning.
 2013-07-19 13:33:19 -07:00
Deepanshu Gupta
a2f41b23b6 am bf8be2ee: Merge "Add orientation to configuration for layoutlib." into jb-mr2-dev 
* commit 'bf8be2eefb1f5172582f688cbc090ec04d6908f1':
  Add orientation to configuration for layoutlib.
 2013-07-19 13:33:17 -07:00
Roman Nurik
0f33e44fbc am 0987ff87: Merge "Add Flo to device art generator." into jb-mr2-dev 
* commit '0987ff8768512c3d519a5d5bbe5c4eb6b54548dc':
  Add Flo to device art generator.
 2013-07-19 13:33:05 -07:00
Jeff Brown
2445880c5c am ba8a5413: Fix missing lock in power manager. 
* commit 'ba8a54136d184d48fbed4f7b27734f645e4e8ad0':
  Fix missing lock in power manager.
 2013-07-19 13:32:48 -07:00
Craig Mautner
a64325f6e7 am 7c6be10d: Remove iterators (DO NOT MERGE) 
* commit '7c6be10d314413bb7afbed41017343320319915d':
  Remove iterators (DO NOT MERGE)
 2013-07-19 13:32:40 -07:00
Joe Fernandez
ab00d352ff am 658374d5: am 2685febd: am 6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev 
* commit '658374d56577a4f8864ba3c7ed8f2e425d13d997':
  docs: Android SDK 22.0.4 Release Notes
 2013-07-19 13:05:12 -07:00
Joe Fernandez
658374d565 am 2685febd: am 6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev 
* commit '2685febd0d51bac4da755756b5348eb95c57ef73':
  docs: Android SDK 22.0.4 Release Notes
 2013-07-19 13:02:24 -07:00
Joe Fernandez
2685febd0d am 6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev 
* commit '6f75a73c04ebd5f0ae10e6e89618f492d842ed96':
  docs: Android SDK 22.0.4 Release Notes
 2013-07-19 12:59:11 -07:00
Joe Fernandez
6f75a73c04 Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev 2013-07-19 19:55:48 +00:00
Eric Laurent
c1167a93dd Merge "VolumePreference: fix audio sample playback" 2013-07-19 19:50:31 +00:00
Amith Yamasani
7e81dd274f Merge "Have UserManagerService clear the restrictions and unblock apps" 2013-07-19 19:48:21 +00:00
Eric Laurent
aca105cfb4 VolumePreference: fix audio sample playback 
Handle audio sample start/stop request in a handler
to avoid race conditions.

If a sample is active, do not ignore playback requests but
schedule a second attempt one second later. This is to avoid
ignoring a playback request if a sample is short or about to finish.

Bug: 8176776.

Change-Id: If2d5f7d469eba345af3f4771067a076a56f4bfed
 2013-07-19 19:48:02 +00:00
Igor Murashkin
194ea7d9a3 Merge "camera2 api: Output classes for key types where it makes sense" 2013-07-19 19:16:06 +00:00
Joe Fernandez
5b7e6a335e docs: Android SDK 22.0.4 Release Notes 
Change-Id: Ia140f81dce8352860149cf709e1ed0be46c052a0
 2013-07-19 11:47:00 -07:00
Craig Mautner
0f4ab97c23 Access sparse array in correct manner 
Was using get() for iteration. Consequence of cl 331550.

Fixes bug 9902476.

Change-Id: I4ec08d0421411981db8b8fba7342e9a3db606ce1
 2013-07-19 11:07:29 -07:00
Mike Lockwood
757ec7837d Merge "LocalSocket: Add support for SOCK_DGRAM and SOCK_SEQPACKET" 2013-07-19 17:39:28 +00:00
Baligh Uddin
94edfc99c8 Merge "Import translations. DO NOT MERGE" 2013-07-19 17:19:20 +00:00
Wink Saville
71795c73b4 Merge "checkMobileProvisioning is not using sendNotification." 2013-07-19 17:14:41 +00:00
Baligh Uddin
a2089f47fe Merge "Import translations. DO NOT MERGE" 2013-07-19 17:12:19 +00:00
Robert Greenwalt
8c87b29793 Merge "Make CS.isTetheringSupported dynamic" into jb-mr2-dev 2013-07-19 17:10:38 +00:00
Wink Saville
c2fee24f76 checkMobileProvisioning is not using sendNotification. 
Change-Id: Ie5b98b462b29fe9339fcb8207d2d33e3028a155c
 2013-07-19 09:27:56 -07:00
Ben Murdoch
a5cdd51cb7 Add WebView.evaluateJavaScript(String, ValueCallback) API. 
This API is intended to replace the "WebView.loadUrl("javascript:...")
pattern that is the current mechanism for executing JavaScript in the
context of the current page displayed in the WebView.

The new API is more convenient - it doesn't trigger the normal URL
loading path - and so does not have side effects such as hiding
the keyboard - and allows the caller to specify a callback that will
be invoked once the script execution is complete.

BUG=9814043

Change-Id: I3f27e8ff5371077d9265430090d61381a3a86e76
 2013-07-19 10:24:05 +01:00
Satoshi Kataoka
c0743ec466 Merge "Fix an issue on hardcoded alarm settings intent" 2013-07-19 03:26:53 +00:00
Kenny Root
4231185a2e Merge "KeySets: better rejection for badly-formed manifest" 2013-07-19 01:43:40 +00:00
Christopher Tate
3e07a89b2c Fix build & preserve DHCP scheduling as-is 
Change-Id: I4063b18532c476280f343658bf3641495e526ed4
 2013-07-18 18:23:57 -07:00
Christopher Tate
b4be694873 Merge "Twilight alarms are now non-wakeup but exact" 2013-07-19 00:54:37 +00:00
Christopher Tate
7359766116 Twilight alarms are now non-wakeup but exact 
Change-Id: Iccb15065d7a0483f0bc2aff0238b94e946b8cbf1
 2013-07-18 17:52:44 -07:00
Dianne Hackborn
c0dfee29a8 Merge "Fix issue #9925269: Naver app crashes on launch" 2013-07-19 00:46:40 +00:00
Christopher Tate
eeda23d2e1 Merge "Make more calendar alarms exact" 2013-07-19 00:42:38 +00:00
Christopher Tate
9e4b6f5a69 Make more calendar alarms exact 
Change-Id: I5ef72268b0605ba5a635b70d2b521533d3bd3ef0
 2013-07-18 17:41:32 -07:00
Colin Cross
5408ae83e8 Merge "Use virtual screen size to determine lowmemorykiller tuning" 2013-07-19 00:35:29 +00:00
Colin Cross
4107a81365 Merge "Add properties to override size and density" 2013-07-19 00:35:01 +00:00
Dianne Hackborn
ff32f353f8 Fix issue #9925269: Naver app crashes on launch 
No comment.

Change-Id: I084cbbf21cacdce179c11528b7217fdc6006dceb
 2013-07-18 17:31:13 -07:00
Christopher Tate
1a80cfe968 Merge "Batch alarms to reduce device wakeups" 2013-07-19 00:22:59 +00:00
Colin Cross
637dbfcaf0 Use virtual screen size to determine lowmemorykiller tuning 
Use the virtual screen resolution returned by getBaseDisplaySize
instead of the physical screen resolution returned by
getInitialDisplaySize.  The memory required by apps will scale
with graphics buffer size, which are generally relative to the
virtual screen resolution.

Change-Id: I0476e4afad99eca2f4f56042a8dbef5b3c7889db
 2013-07-18 17:15:15 -07:00
Colin Cross
ef96fd9009 Add properties to override size and density 
Add properties ro.config.density_override and ro.config.size_override
to provide build-time virtual screen sizes.  A device with no
override set with "wm size" will use the size specified by the property.
"wm size reset" will go back to the physical size.

Change-Id: I07a585eb2e0f91365fac2b64c53de3af138a2a85
 2013-07-18 17:09:56 -07:00
Dianne Hackborn
059bf080fb Merge "Fix crash." 2013-07-18 23:53:33 +00:00
Dianne Hackborn
127c5ef5d7 Fix crash. 
Change-Id: I0b5d846d5a9e6b1c7c3756b653833c263634270b
 2013-07-18 16:51:04 -07:00
Igor Murashkin
27b62ae8eb camera2 api: Output classes for key types where it makes sense 
Change-Id: I0f74c110cc4917bfd96d812ee98c385bb1b937b7
 2013-07-18 16:49:24 -07:00
Jeff Brown
be94819065 Merge "Fix build." 2013-07-18 23:38:41 +00:00
Jeff Brown
b9ff71375a Fix build. 
Change-Id: Ie83f51ab4b8fddceda8d4f0ac24c532eab7458b8
 2013-07-18 16:37:44 -07:00
Zhijun He
563057740d Merge "Update camera metedata" 2013-07-18 23:20:47 +00:00
Amith Yamasani
1a7472e722 Have UserManagerService clear the restrictions and unblock apps 
Since this is an operation that could take a few seconds to run and needs to be
completed even if Settings dies, best to do it in the user manager.

Refactored PIN challenge/setup UI with a field to verify existing pin
when changing to a new one.

Change-Id: I0b7df5b2ccb7f343aa9282a9245d3bc2b577a794
 2013-07-18 16:12:27 -07:00
Scott Main
ca3b4e9b7e remove significant motion 
Change-Id: I764d7253d9eb4aa9f7e94f5628a29f648fd9811b
 2013-07-18 16:10:37 -07:00
Dianne Hackborn
d33dc21c95 Merge "Fix issue #9913990: Background processes are being added to..." 2013-07-18 22:56:04 +00:00
Chris Craik
ef5498edf6 Merge "Add reconfigure method to Bitmap" 2013-07-18 22:55:44 +00:00