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

109261 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chad Brubaker
f336d722c7 Fix supplimentary network connections with VPNs 
Enables the use of supplimentary mobile networks like MMS, and HIPRI
while VPNs are running.

Change-Id: I313f57a905b4e16bd4322c68687cbff1cfbe9d3e
 2013-07-19 15:57:05 -07:00
Christopher Tate
a5bc070e9e Merge "EWRONGVARNAME" 2013-07-19 21:54:50 +00:00
Christopher Tate
e982faffc9 EWRONGVARNAME 
Bug 9940349

Change-Id: I60205899cd33070394752fc4b2f1e0cf6a2d9192
 2013-07-19 14:52:49 -07:00
Joe Fernandez
5846f7c9d8 am b9aa1789: am 379cb6b7: am ab00d352: am 658374d5: am 2685febd: am 6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev 
* commit 'b9aa1789ee221c45bd3c01bae4ae99d7965c1437':
  docs: Android SDK 22.0.4 Release Notes
 2013-07-19 14:40:01 -07:00
Robert Greenwalt
bfc7634b36 resolved conflicts for merge of f9774dc7 to master 
Change-Id: Ia9509ab6897e27da8bf4fc61a4140f2f93acb80f
 2013-07-19 14:30:49 -07:00
Scott Main
a29447e142 am 8b5f79a0: am a74517d2: am ca3b4e9b: remove significant motion 
* commit '8b5f79a0cb72af51a057c27ca3f0511076577e1f':
  remove significant motion
 2013-07-19 14:22:14 -07:00
Scott Main
612e67eb44 am a12d5e0d: am 52a74a21: am 1be76349: Merge "more details about account access in restricted profiles" into jb-mr2-dev 
* commit 'a12d5e0dcab49fb02cac3e7982f1ad0ecf170a40':
  more details about account access in restricted profiles
 2013-07-19 14:22:12 -07:00
Scott Main
f5218a8fff am 8d6d93c3: am 1cf7b4a4: am d3ed45f8: am 991487c6: am 9a1f106d: am 34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev 
* commit '8d6d93c3b2ed41324d2bcf8bbfc4c5a3b5d6416e':
  fix typo in code sample
 2013-07-19 14:22:09 -07:00
Dirk Dougherty
2289382cfa am 64127efb: am 46cc4dbb: am e0380d8f: resolved conflics for merge of 54201120 to jb-mr2-dev 
* commit '64127efbe65f73a01cf15366e08406bf7cb537d9':
  Doc change: Add Colopl video to carousel and spotlight.
 2013-07-19 14:22:06 -07:00
Robert Greenwalt
538cdb98ef resolved conflicts for merge of 85b5e4c4 to master 
Change-Id: Idd0ad9b1504fddf68c4c4cc04731de1eddd204b3
 2013-07-19 14:09:30 -07:00
Jean-Michel Trivi
f40a0535ac am a8f7659a: am f65c9189: am bbc9a62a: Cleaner Tejat notification in Audio Package 11 
* commit 'a8f7659aba2c9233fb61ae34dfc0d7477dc0ae91':
  Cleaner Tejat notification in Audio Package 11
 2013-07-19 13:42:39 -07:00
Wink Saville
0871ac2afb am b96cca27: am df43ba82: am e3badc10: Merge "When a SIM is changed check mobile provisioning." into jb-mr2-dev 
* commit 'b96cca27ba15121aab2c481786a292880c007bb6':
  When a SIM is changed check mobile provisioning.
 2013-07-19 13:42:36 -07:00
Deepanshu Gupta
903709d738 am 388f85eb: am a2f41b23: am bf8be2ee: Merge "Add orientation to configuration for layoutlib." into jb-mr2-dev 
* commit '388f85eb451bd0b61c8f48b500de5db6bca941f1':
  Add orientation to configuration for layoutlib.
 2013-07-19 13:42:34 -07:00
Roman Nurik
796feda0f0 am d96c6956: am 0f33e44f: am 0987ff87: Merge "Add Flo to device art generator." into jb-mr2-dev 
* commit 'd96c6956807ca1644079a9e92d0e3af170c51c8f':
  Add Flo to device art generator.
 2013-07-19 13:42:30 -07:00
Jeff Brown
c48e0a5152 am 7afdf7f0: am 2445880c: am ba8a5413: Fix missing lock in power manager. 
* commit '7afdf7f0514bebe1188e0c1bc60e76f853065e82':
  Fix missing lock in power manager.
 2013-07-19 13:42:27 -07:00
Craig Mautner
1305bf7dc2 am 70eac41f: (-s ours) am a64325f6: am 7c6be10d: Remove iterators (DO NOT MERGE) 
* commit '70eac41f7044552305beae86eb0978cd74724ecf':
  Remove iterators (DO NOT MERGE)
 2013-07-19 13:42:24 -07:00
Joe Fernandez
b9aa1789ee am 379cb6b7: am ab00d352: am 658374d5: am 2685febd: am 6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev 
* commit '379cb6b7f0f62009caeeda00a05d3185bc06b8aa':
  docs: Android SDK 22.0.4 Release Notes
 2013-07-19 13:38:02 -07:00
Robert Greenwalt
f9774dc796 am ddf17b5b: am 8c87b297: Merge "Make CS.isTetheringSupported dynamic" into jb-mr2-dev 
* commit 'ddf17b5b82f25965502377588483abbc328c4e6d':
  Make CS.isTetheringSupported dynamic
 2013-07-19 13:37:58 -07:00
Scott Main
8b5f79a0cb am a74517d2: am ca3b4e9b: remove significant motion 
* commit 'a74517d25d8258ed14d4cf4aab7cf82d6b51e729':
  remove significant motion
 2013-07-19 13:37:54 -07:00
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
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