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

8788 Commits

Author SHA1 Message Date
Eric Laurent
6811b1cdb5 am c5db63b6: Merge "Hide AudioDevice class" into lmp-dev 
* commit 'c5db63b67a64b8319ce35a4e83770db6a5367fbe':
  Hide AudioDevice class
 2014-09-10 17:31:51 +00:00
Eric Laurent
b94b5d33b2 Merge "Hide AudioDevice class" into lmp-dev 2014-09-10 17:28:56 +00:00
Esteban Talavera
964a03bcaa am 55bffb50: Merge "Update string value for provisioning action and extra" into lmp-dev 
* commit '55bffb5041e18f2cf6884841165c2bbaf9576b98':
  Update string value for provisioning action and extra
 2014-09-10 17:06:45 +00:00
Esteban Talavera
df980618a3 Merge "Update string value for provisioning action and extra" into lmp-dev 2014-09-10 16:26:50 +00:00
Christoph Studer
7c6c8bc488 am 6e68dff3: Merge "NoLiService: Delete @removed meetsInterruptionFilter" into lmp-dev 
* commit '6e68dff3deb0ec350aa769b4936e52ea00262beb':
  NoLiService: Delete @removed meetsInterruptionFilter
 2014-09-10 11:22:06 +00:00
Christoph Studer
c8e1d78af9 Merge "NoLiService: Delete @removed meetsInterruptionFilter" into lmp-dev 2014-09-10 11:14:33 +00:00
Adam Connors
fb324578aa am 5e1fe70f: Merge "Add feature flags for verified boot and securely remove users." into lmp-dev 
* commit '5e1fe70f82a58b3afe87ed14f5c44e02e05ddccb':
  Add feature flags for verified boot and securely remove users.
 2014-09-10 10:16:38 +00:00
Adam Connors
c90f95c79d Merge "Add feature flags for verified boot and securely remove users." into lmp-dev 2014-09-10 10:07:15 +00:00
Jessica Hummel
4eea5f821e am 1e4efc91: Merge "Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager." into lmp-dev 
* commit '1e4efc916adb2e62f1189a6f1d8c54f8970a31f6':
  Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager.
 2014-09-10 09:16:00 +00:00
Jessica Hummel
ec19d621b3 Merge "Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager." into lmp-dev 2014-09-10 08:08:48 +00:00
Jessica Hummel
e3da790f8c Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager. 
Change-Id: I6fe96df66a4a78cf2e2455d58bba13051d108fdf
bug:17152955
 2014-09-10 08:08:02 +00:00
Zhijun He
7c3f8affdc am 5ef21e48: Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev 
* commit '5ef21e48b80876178636f3c5936c81409843ff7a':
  CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P
 2014-09-10 06:58:12 +00:00
Lajos Molnar
a3f86cb0c7 am 4f276471: Merge "MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo" into lmp-dev 
* commit '4f2764717bab9175eb1a22bcd770ff52d5c955f5':
  MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo
 2014-09-10 06:58:04 +00:00
Wink Saville
d02ec8d965 Update current.txt for two renamed methods. 
getSmsManagerUsingSubId and getSubIfnoUsingSubId now have ForSubscriber
as their suffix instead of UsingSubId.

Change-Id: I1e36a4770463fd0d6a2656c3bcbbfc07bd747e01
 2014-09-09 22:43:39 -07:00
Zhijun He
350f2552e4 Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev 2014-09-10 05:12:28 +00:00
Lajos Molnar
2c5afa320e Merge "MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo" into lmp-dev 2014-09-10 02:38:50 +00:00
Junda Liu
7100d15a99 am bdf9cf90: Add ForSubscriber suffix to APIs w/ subId argument. 
* commit 'bdf9cf904c5f7c61c1d77ba4261238fdbb9b08d8':
  Add ForSubscriber suffix to APIs w/ subId argument.
 2014-09-10 01:00:59 +00:00
Junda Liu
13e28bb938 Add ForSubscriber suffix to APIs w/ subId argument. 
Bug: b/17255752
Change-Id: I142d8961aa4c1fa074833f70c404c955caea0870
 2014-09-09 17:50:09 -07:00
Lajos Molnar
d7e5f680fa MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo 
Bug: 17059255
Change-Id: I9f5f0be61e94795d90ad29e94b3a1a6e6aedfb1d
 2014-09-09 17:27:26 -07:00
Jeff Tinker
eb5279525b am 50bb6215: Merge "Add support for max-res decode" into lmp-dev 
* commit '50bb621501fafc85be31e2039a43e6bbe93344bd':
  Add support for max-res decode
 2014-09-10 00:17:58 +00:00
Eino-Ville Talvala
2005a1c210 am 28312293: Merge "Camera2: Add frameNumber to CaptureCallback#onCaptureStarted" into lmp-dev 
* commit '28312293a2dfab504e5d1e6102c5392d652b6981':
  Camera2: Add frameNumber to CaptureCallback#onCaptureStarted
 2014-09-10 00:16:03 +00:00
Jeff Tinker
b00ab012bf Merge "Add support for max-res decode" into lmp-dev 2014-09-09 23:56:11 +00:00
Zhijun He
b67c3102c9 CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P 
Bug: 17059255
Change-Id: Ic6b272e4ceec8fc852c9eb787370f4d366dad0ac
 2014-09-09 16:19:10 -07:00
Eino-Ville Talvala
31913c334a Merge "Camera2: Add frameNumber to CaptureCallback#onCaptureStarted" into lmp-dev 2014-09-09 22:20:58 +00:00
Amith Yamasani
52f57637a2 am 7a9f541e: Merge "User restriction to disallow outgoing NFC beam" into lmp-dev 
* commit '7a9f541e596b4db8824969678896161c8e06d6bc':
  User restriction to disallow outgoing NFC beam
 2014-09-09 20:38:39 +00:00
Amith Yamasani
da6e6c888f Merge "User restriction to disallow outgoing NFC beam" into lmp-dev 2014-09-09 20:29:57 +00:00
Wink Saville
f2090b88b7 Unhide SubscriptionManager and SubInfoRecord 
Change-Id: I1e6efb4442f0400d404d725c7db5020a26c00f98
 2014-09-09 19:51:45 +00:00
Eino-Ville Talvala
e8df3093f5 Camera2: Add frameNumber to CaptureCallback#onCaptureStarted 
Otherwise, cannot reliably match up capture progressed and failure callbacks
with the start callback.

Bug: 17421092
Change-Id: I91d92be70a15536b215bac330370ce37e426ec26
 2014-09-09 12:38:11 -07:00
Amith Yamasani
26af829fd7 User restriction to disallow outgoing NFC beam 
This can be controlled by MDMs via DPM.

Also fixes:
 - javadoc for restrictions
 - persisting of cross profile copy/paste restriction

Bug: 17387303
Change-Id: Ie148f56189181d2a4c6345c0823d417ab13a94a3
 2014-09-09 12:09:47 -07:00
Craig Mautner
c09a20c4c3 am 77e1dc74: Merge "Remove deprecated (and now unused) API method." into lmp-dev 
* commit '77e1dc741bfce75f3e3f5446674d1545a74eae2b':
  Remove deprecated (and now unused) API method.
 2014-09-09 17:10:35 +00:00
Craig Mautner
345d4f4f14 Merge "Remove deprecated (and now unused) API method." into lmp-dev 2014-09-09 17:05:04 +00:00
Dianne Hackborn
8d7567f406 am 0ad9e247: Merge "Add new wallpaper features for insets and offsets." into lmp-dev 
* commit '0ad9e247c3b553baee5b42599536d9b0bfbbba31':
  Add new wallpaper features for insets and offsets.
 2014-09-09 16:45:04 +00:00
Dianne Hackborn
bb8c483461 Merge "Add new wallpaper features for insets and offsets." into lmp-dev 2014-09-09 16:41:44 +00:00
Esteban Talavera
ef9c523848 Update string value for provisioning action and extra 
As per API review. This will be submitted in sync with a new version of DMAgent, as the string is hardcoded there.

Bug: 17389863
Change-Id: I3a3d7a9cf05bcb713da8690ceec6af02845a5ff1
 2014-09-09 17:14:43 +01:00
Craig Mautner
0321573fa7 Remove deprecated (and now unused) API method. 
Removes ActivityOptions.makeLaunchTaskBehindAnimation().

Fixes bug 16958544.

Change-Id: I2d58f4235994fe01d55b3309d0ec6f8449c5d5b8
 2014-09-09 08:53:56 -07:00
Christoph Studer
704dd61f5b NoLiService: Delete @removed meetsInterruptionFilter 
This should not break any apps as this API has been marked
@removed more than a week ago.

Bug: 17425123
Change-Id: I19d7e933a3f2a59e1b406a9f87d272f058a13e0d
 2014-09-09 11:31:43 +02:00
Eric Laurent
f105ec89ef am 602e21fa: Merge "unhide AudioAttributes flag FLAG_HW_AV_SYNC" into lmp-dev 
* commit '602e21faa63a915b4cb5b616a7b8dde509e8ee0a':
  unhide AudioAttributes flag FLAG_HW_AV_SYNC
 2014-09-09 02:32:31 +00:00
Eric Laurent
7c36c86342 Merge "unhide AudioAttributes flag FLAG_HW_AV_SYNC" into lmp-dev 2014-09-09 01:59:00 +00:00
Eric Laurent
56340fc2e8 unhide AudioAttributes flag FLAG_HW_AV_SYNC 
Bug: 17112525.
Change-Id: Ia817d8e4b6e517da04f948bcb138fc38faea6caf
 2014-09-08 18:51:35 -07:00
Dianne Hackborn
067e5f68b9 Add new wallpaper features for insets and offsets. 
Issue #17394151: WallpaperService / Engines need to get notified
of WindowInsets

Issue #17394203 Wallpapers need a system API to be shifted in order
to support burn in protection

Adds a new API on WallpaperManager to set additional offsets to
make wallpapers extend beyond the display size.

Insets are now reported to wallpapers, to use as they may.  This
includes information about the above offsets, so they can place
their content within the visible area.  And to help with this, also
expose the stable offsets APIs in WindowInsets which is also very
useful information for the wallpaper.

Another new API on WallpaperManager to set a raw offset to apply
to the wallpaper window, forcing it to move on the screen regardless
of what the wallpaper is drawing.

Fix wallpapers when used with overscan enabled, so they still extend
out across the entire screen.  Conveniently, the above new window
insets information is very useful for this case as well!

And a new wallpaper test app for all this stuff.

Change-Id: I287ee36581283dd34607609fcd3170d99d120d8e
 2014-09-08 18:02:18 -07:00
Michael Wright
48b33821fb am 1c5d160b: Merge "Add FEATURE_GAMEPAD to current.txt" into lmp-dev 
* commit '1c5d160baea5d7e37f605c2756cbe60c63d36469':
  Add FEATURE_GAMEPAD to current.txt
 2014-09-09 00:18:45 +00:00
Michael Wright
b62bb77931 Merge "Add FEATURE_GAMEPAD to current.txt" into lmp-dev 2014-09-09 00:07:29 +00:00
Michael Wright
3afd6e3fc6 Add FEATURE_GAMEPAD to current.txt 
Change-Id: I5c5a7910983ac3bc5850fba2dfc4d96b11fbd2f0
 2014-09-08 16:57:38 -07:00
Tom Taylor
1ee373ebb2 Merge "Revert "DO NOT MERGE - Hide new SmsManager API's dealing with SubId"" into lmp-sprout-dev 2014-09-08 22:30:48 +00:00
Tom Taylor
2cb9eade62 Revert "DO NOT MERGE - Hide new SmsManager API's dealing with SubId" 
We *want* this API public for L-sprout.

This reverts commit 4ce136a90a6fb29373ea956cdd3f084b68a18ce9.

Change-Id: I53672aff2aa25b41bb4ce1f78862f0fe43474a8c
 2014-09-08 14:58:39 -07:00
Andrew Lee
be5b656940 Merge "Rename methods/variables on PhoneAccount for API cleanup." into lmp-dev 2014-09-08 21:45:41 +00:00
Yorke Lee
478f5a6212 Merge "Replace Calls.FEATURES_NONE with 0 (1/4)" into lmp-dev 2014-09-08 21:43:30 +00:00
Tom Taylor
bb3b2dcafb Merge "DO NOT MERGE - Hide new SmsManager API's dealing with SubId" into lmp-dev 2014-09-08 21:17:21 +00:00
Kenny Guy
d9037a48c6 Merge "Renaming of LauncherApps apis" into lmp-dev 2014-09-08 20:47:07 +00:00
Yorke Lee
e3198b719f Replace Calls.FEATURES_NONE with 0 (1/4) 
Bug: 17253963
Change-Id: I9e9e56cdf4c9a60ac1e047bef0eba2ba0c8f10fb
 2014-09-08 13:33:51 -07:00