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

189498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jae Seo
7843e10e60 TIF: Add TvContentRating constant for unrated content 
Bug: 19102311
Change-Id: I159a3d05197539b4badee6dccf21f15c388b186e
 2015-04-23 23:36:07 -07:00
Ed Heyl
88d109d2c5 Merge "Fix the build: Revert "Anti-alias by default"" 2015-04-24 04:58:48 +00:00
Ed Heyl
1c44ba9fd4 Fix the build: Revert "Anti-alias by default" 
This reverts commit d34b7329935a6f9ffdc9a40c01f7b558e07830d4.

Change-Id: I74e63570ce868e6d8c36fd2e1c864419bd6102e4
 2015-04-24 04:57:24 +00:00
Dongwon Kang
c30327cbb3 Merge "TIF: use <p> tag in a consistent way." 2015-04-24 04:57:05 +00:00
Dongwon Kang
0610e12733 TIF: use <p> tag in a consistent way. 
Bug: 20340510
Change-Id: I2422646f01542f571d033ee363df58e0906f3514
 2015-04-24 13:55:44 +09:00
Dongwon Kang
7771d4e125 Merge "TIF: start using @Nullable annotation." 2015-04-24 04:42:56 +00:00
Jeff Sharkey
d8c3b1510e Merge "Package and storage movement callbacks." 2015-04-24 04:08:24 +00:00
Chong Zhang
f2ae3a8ead Merge "MediaHTTPConnection: set connect time out" 2015-04-24 03:47:50 +00:00
Jeff Sharkey
620b32b316 Package and storage movement callbacks. 
Since package and primary storage movement can take quite awhile,
we want to have SystemUI surface progress and allow the Settings
app to be torn down while the movement proceeds in the background.

Movement requests now return a unique ID that identifies an ongoing
operation, and interested parties can observe ongoing progress and
final status.  Internally, progress and status are overloaded so
the values 0-100 are progress, and any values outside that range
are terminal status.

Add explicit constants for special-cased volume UUIDs, and change
the APIs to accept VolumeInfo to reduce confusion.  Internally the
UUID value "null" means internal storage, and "primary_physical"
means the current primary physical volume.  These values are used
for both package and primary storage movement destinations.

Persist the current primary storage location in MountService
metadata, since it can be moved over time.

Surface disk scanned events with separate volume count so we can
determine when it's partitioned successfully.  Also send broadcast
to support TvSettings launching into adoption flow.

Bug: 19993667
Change-Id: Ic8a4034033c3cb3262023dba4a642efc6795af10
 2015-04-23 20:32:17 -07:00
Lajos Molnar
61044cfd9c Merge "media: deprecate correct codec color formats, add flexible formats" 2015-04-24 02:57:18 +00:00
Lajos Molnar
1af95701f7 Merge "media: add flexible YUV422, 444, and RGB/RGBA formats" 2015-04-24 02:56:47 +00:00
Lajos Molnar
931ae62f29 media: unhide and document already used fields 
Bug: 18134807
Bug: 19300915
Bug: 11990564
Change-Id: Iaeab4a5359b946c4b1aeef6083d10045079b9720
 2015-04-23 19:39:57 -07:00
Lajos Molnar
e7f12bfdf6 media: deprecate correct codec color formats, add flexible formats 
Change-Id: Ie79c4027fa969fe352da224b3f1844b0a7eaaeaa
 2015-04-24 02:34:48 +00:00
Andy Hung
b33d878de3 Merge "Add getFormat to AudioTrack and AudioRecord" 2015-04-24 02:26:29 +00:00
Lajos Molnar
d1d27c1543 media: add flexible YUV422, 444, and RGB/RGBA formats 
These are used by Media.Image on getOutputImage.

Change-Id: I171c5b90423800eeab4e36625dcf727a2a2affcd
 2015-04-23 19:14:32 -07:00
Jinsuk Kim
b349213891 Merge "CEC: Check port id for ARC status update on hotplug" 2015-04-24 01:45:29 +00:00
Dongwon Kang
4bf607b00c TIF: start using @Nullable annotation. 
Added @Nullable annotation when the javadoc sprcifies the return value
or argument can be null.

Bug: 19941047
Change-Id: I823189a242fae10ca14788fee9747bf5d59f5eb3
 2015-04-24 10:31:14 +09:00
Jose Lima
786144599e Merge "Add pre-order as a pricing type for ContentInfoExtender" 2015-04-24 01:23:34 +00:00
Chong Zhang
90b5975043 MediaHTTPConnection: set connect time out 
bug: 19890444
Change-Id: Ib669e6d1524620b37a683612369b405c8367f4a5
 2015-04-23 18:21:05 -07:00
Andy Hung
463a8c7743 Add getFormat to AudioTrack and AudioRecord 
This enables getting channel index masks and is future-friendly.

Change-Id: Ia0bb9a855e97e8279b2226cf75e0ddd03af3fb7f
 2015-04-23 18:10:58 -07:00
Wei Jia
c87326127e Merge "MediaSync: fix message delay based on play time for pending audio frames." 2015-04-24 00:46:27 +00:00
Santos Cordon
1ff1d3203f Merge "Remove CallState and rename PRE_DIAL_WAIT" 2015-04-24 00:06:55 +00:00
Adrian Roos
a09c5eed32 Merge "Fix disappearing status bar icons with SHOW_WHEN_LOCKED" 2015-04-23 23:56:32 +00:00
Yorke Lee
2973868885 Merge "Add TelecomManager.placeCall" 2015-04-23 23:49:24 +00:00
Yorke Lee
3e56ba14cc Add TelecomManager.placeCall 
Places a new outgoing call using the system telecom service
with the specified parameters.

Making emergency calls using this method requires that the
method-caller is either the user-selected default dialer app
or preloaded system dialer app.

Requires that the caller have the
{@link android.Manifest.permission#CALL_PHONE} permission.

Bug: 20348183
Change-Id: Ieedb5628e8c6be25137944e7c3639dc1d9bc61df
 2015-04-23 16:48:52 -07:00
Glenn Kasten
9e29086d5d Fix build 
Change-Id: I0f83f4d1df85f4b3c59cfff54b8c78ea4aefbd1d
 2015-04-23 16:42:47 -07:00
Jose Lima
4112056201 Add pre-order as a pricing type for ContentInfoExtender 
Change-Id: Ibf9e4f57b47e92789d3e0730c58b0bce14663fec
 2015-04-23 16:25:10 -07:00
Ben Kwa
ff0cf1a95e Merge "Move extension checking code into FileUtils." 2015-04-23 23:19:49 +00:00
Andrew Solovay
4a3aa4f623 am d25f1f78: am 090df87d: am 4dde4c9e: am e45e41d7: am 44fa5e71: am 5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs 
* commit 'd25f1f7877c8311dfdcbb6deb1c21b06f15f8914':
  Docs: Correcting section on how to escape quotes in strings.
 2015-04-23 23:16:25 +00:00
Andrew Solovay
8664ad1e3e am 8ddc9672: am 8aff67ec: am dad05551: am 24ccb900: am 7a866a88: am 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs 
* commit '8ddc96724624ba4dfed000365f404b6113188ac0':
  docs: Update to doc on listening for restrictions-changed intent
 2015-04-23 23:16:19 +00:00
Svet Ganov
f1298a3ef7 am 2fd6dda0: (-s ours) am f33489c6: am d24cc193: am db672b6c: am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev 
* commit '2fd6dda03ef8b63b33bd36f7cfcf1f6ee365d571':
  DO NOT MERGE Don't take flags when creating app widget config activity.
 2015-04-23 23:16:12 +00:00
Ben Kwa
62539a220c Move extension checking code into FileUtils. 
Move code for checking file extensions and MIME types from
ExternalStorageProvider into android.os.FileUtils, so it can be used by
other clients (e.g. DownloadsProvider).

BUG=20157955

Change-Id: Ib16a16af723c21fb8d2912c8917dfd68653ea6fa
 2015-04-23 16:14:20 -07:00
Chris Craik
01fb343fe8 Merge "Anti-alias by default" 2015-04-23 23:06:40 +00:00
Jinsuk Kim
a6d5dad9bf CEC: Check port id for ARC status update on hotplug 
Fixes a bug that was updating ARC status on hotplug event
regardless of the port for which the event occurred.

Bug: 20520664
Change-Id: I17c4f391af4dd221215412ed9e3ff3d730bbf152
 2015-04-24 08:02:57 +09:00
Svetoslav
917c4e4d45 Merge "Clear binder identity before reaching into keyguard settings" 2015-04-23 23:00:06 +00:00
Svetoslav
5bd5d4c2b0 Clear binder identity before reaching into keyguard settings 
Change-Id: I80eeaed235acc165ddd4799ba46700afea2dff55
 2015-04-23 15:55:03 -07:00
Wei Jia
25b802d472 MediaSync: fix message delay based on play time for pending audio frames. 
Bug: 19666434
Change-Id: Ia9ad3858d4ddccf8aa476f2506785f1d76f90b32
 2015-04-23 15:47:50 -07:00
Tony Mantler
3e452a9b96 Merge "Move StorageMeasurement to SettingsLib" 2015-04-23 22:40:12 +00:00
Jonathan Basseri
48f8fe53ee Merge "Adding carrier variables to control certain network settings." 2015-04-23 22:35:10 +00:00
Prerepa Viswanadham
571bb54c73 Reduce log spam in BluetoothAdapter for getState. 
Change-Id: I38995fc55f12b000d58a769ed67aff623865169b
 2015-04-23 22:31:29 +00:00
Paul McLean
e56f57c375 Merge "(Re)routing Notification API in AudioTrack/AudioRecord." 2015-04-23 22:26:17 +00:00
Jonathan Basseri
ad5baab57e Adding carrier variables to control certain network settings. 
Bug: 20270007
Change-Id: I4075c159e4fceb2e8a5bdda1261f8b2470455595
 2015-04-23 15:26:15 -07:00
Paul McLean
ec4097b0ca Merge "Explicit routing in AudioRecord" 2015-04-23 22:25:19 +00:00
Adrian Roos
d322f1af91 Fix disappearing status bar icons with SHOW_WHEN_LOCKED 
Fixes a bug where launching a SHOW_WHEN_LOCKED window from the bouncer
wouldn't properly restore PhoneStatusBar's state leading to missing
status bar icons.

Bug: 20474073
Change-Id: Ib22dc0dc5a89214af8876ddaea52569e2e24a742
 2015-04-23 22:22:36 +00:00
Andrew Solovay
d25f1f7877 am 090df87d: am 4dde4c9e: am e45e41d7: am 44fa5e71: am 5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs 
* commit '090df87d7e3ed91b4bfe659fd0a41fed86cb68a7':
  Docs: Correcting section on how to escape quotes in strings.
 2015-04-23 22:19:40 +00:00
Andrew Solovay
8ddc967246 am 8aff67ec: am dad05551: am 24ccb900: am 7a866a88: am 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs 
* commit '8aff67ec367e43c089080fcb3f4e73ac7ac7aaf1':
  docs: Update to doc on listening for restrictions-changed intent
 2015-04-23 22:19:33 +00:00
Svet Ganov
2fd6dda03e am f33489c6: am d24cc193: am db672b6c: am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev 
* commit 'f33489c6bda49cf930cb06601625ddf792d41fe7':
  DO NOT MERGE Don't take flags when creating app widget config activity.
 2015-04-23 22:19:04 +00:00
Adrian Roos
3acf4f5c91 Merge "Migrate lockscreen.disabled on upgrade" 2015-04-23 22:15:40 +00:00
Adam Powell
a40c2c46b2 Merge "Fixes for ChooserTargetActivity" 2015-04-23 22:15:27 +00:00
Adrian Roos
4383058bf4 Migrate lockscreen.disabled on upgrade 
Bug: 19962043
Change-Id: Iecec4ea869aeb9d814f7447b4805caa571f3fd01
 2015-04-23 22:14:12 +00:00