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

109407 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
a12d5e0dca am 52a74a21: am 1be76349: Merge "more details about account access in restricted profiles" into jb-mr2-dev 
* commit '52a74a2143274b2a3c5906cc882fa48d687b5cf8':
  more details about account access in restricted profiles
 2013-07-19 13:37:50 -07:00
Scott Main
8d6d93c3b2 am 1cf7b4a4: am d3ed45f8: am 991487c6: am 9a1f106d: am 34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev 
* commit '1cf7b4a438a01d2c018699e38332965b366f479c':
  fix typo in code sample
 2013-07-19 13:37:47 -07:00
Dirk Dougherty
64127efbe6 am 46cc4dbb: am e0380d8f: resolved conflics for merge of 54201120 to jb-mr2-dev 
* commit '46cc4dbb38968dadffcc5f78dd69d391768711e1':
  Doc change: Add Colopl video to carousel and spotlight.
 2013-07-19 13:37:44 -07:00
Robert Greenwalt
85b5e4c48f am b5bf655c: am e874bd35: Merge "Add gservices updater for carrier provisioning url" into jb-mr2-dev 
* commit 'b5bf655cc6cc9128aec99958cce3b054348c9273':
  Add gservices updater for carrier provisioning url
 2013-07-19 13:37:41 -07:00
Jean-Michel Trivi
a8f7659aba am f65c9189: am bbc9a62a: Cleaner Tejat notification in Audio Package 11 
* commit 'f65c9189843ea55fc3e3c7154331c9f0ad330210':
  Cleaner Tejat notification in Audio Package 11
 2013-07-19 13:37:38 -07:00
Wink Saville
b96cca27ba am df43ba82: am e3badc10: Merge "When a SIM is changed check mobile provisioning." into jb-mr2-dev 
* commit 'df43ba82e6c232985a95c9827f7d71dd3194e0a8':
  When a SIM is changed check mobile provisioning.
 2013-07-19 13:37:35 -07:00
Deepanshu Gupta
388f85eb45 am a2f41b23: am bf8be2ee: Merge "Add orientation to configuration for layoutlib." into jb-mr2-dev 
* commit 'a2f41b23b6328b0ff3bb04d4a88ccf4a84a50375':
  Add orientation to configuration for layoutlib.
 2013-07-19 13:37:32 -07:00
Roman Nurik
d96c695680 am 0f33e44f: am 0987ff87: Merge "Add Flo to device art generator." into jb-mr2-dev 
* commit '0f33e44fbc2e506fce71bf087a0b18b7979daaf9':
  Add Flo to device art generator.
 2013-07-19 13:37:28 -07:00
Jeff Brown
7afdf7f051 am 2445880c: am ba8a5413: Fix missing lock in power manager. 
* commit '2445880c5cb6504455bd5cae38a850744f4804be':
  Fix missing lock in power manager.
 2013-07-19 13:37:25 -07:00
Craig Mautner
70eac41f70 am a64325f6: am 7c6be10d: Remove iterators (DO NOT MERGE) 
* commit 'a64325f6e70569255ff395a85ec161f3230f9e35':
  Remove iterators (DO NOT MERGE)
 2013-07-19 13:37:22 -07:00
Joe Fernandez
379cb6b7f0 am ab00d352: am 658374d5: am 2685febd: am 6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev 
* commit 'ab00d352ffc8a60cf4811cc79dd1dc69bc8ee407':
  docs: Android SDK 22.0.4 Release Notes
 2013-07-19 13:34:28 -07:00
Robert Greenwalt
ddf17b5b82 am 8c87b297: Merge "Make CS.isTetheringSupported dynamic" into jb-mr2-dev 
* commit '8c87b29793da439b8718227bf2d03405c8ad264a':
  Make CS.isTetheringSupported dynamic
 2013-07-19 13:34:22 -07:00
Scott Main
a74517d25d am ca3b4e9b: remove significant motion 
* commit 'ca3b4e9b7e5498650993dc99d70acacc1fa2d1fb':
  remove significant motion
 2013-07-19 13:34:04 -07:00
Scott Main
52a74a2143 am 1be76349: Merge "more details about account access in restricted profiles" into jb-mr2-dev 
* commit '1be763494e9df0d1477dcaa4ba0163cce68f416a':
  more details about account access in restricted profiles
 2013-07-19 13:34:02 -07:00
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
Glenn Kasten
9d2bc860d3 Replace run-time PCM encodings by compile-time constants 
Simplify the code to use the constant values of ENCODING_PCM_16BIT and
ENCODING_PCM_8BIT from AudioFormat.java.

There is already a comment in AudioFormat.java saying that these symbols
need to be kept in sync with this file, and they are public static final
so they can never be changed.

This change is similar to commit 3d301cb2b1d9e61c3af8a8b0b9db370d3d7abf77
or Change-Id I6cb10ac511df4845610454d1659e64d9195d67cd

Change-Id: Ib62d8cfeb6261ffd362dba3600d593e2a268d76a
 2013-07-19 13:31:33 -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
Igor Murashkin
3710db80d4 camera2 api: marshal rect, size, string for metadata 
Change-Id: Iec2fd823bc92394da44abb32ca38a625d7638e3d
 2013-07-19 12:04:48 -07: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