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

54411 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Carlstrom
74e6bd7b77 Merge "New KeyChain API for credential installation" 2011-07-06 14:59:21 -07:00
Christopher Tate
28db8b944a Merge "Make full backup API available to apps" 2011-07-06 14:48:43 -07:00
Jamie Gennis
413b3f7382 SurfaceTexture: enable newly passing tests. 
This change enables the following four SurfaceTextures tests:
  UpdateTexImageBeforeFrameFinishedWorks
  UpdateTexImageAfterFrameFinishedWorks
  RepeatedUpdateTexImageBeforeFrameFinishedWorks
  RepeatedUpdateTexImageAfterFrameFinishedWorks

Change-Id: I7632630bc97873e50d4a765ffc44a86f16ae62f1
 2011-07-06 14:47:47 -07:00
Shimeng (Simon) Wang
a0c26920b6 Merge "Treat restored defaultScale as overview." 2011-07-06 14:40:53 -07:00
Christopher Tate
79ec80db70 Make full backup API available to apps 
New methods for full backup/restore have been added to BackupAgent
(still hidden): onFullBackup() and onRestoreFile().  The former is the
entry point for a full app backup to adb/socket/etc: the app then writes
all of its files, entire, to the output.  During restore, the latter
new callback is invoked, once for each file being restored.

The full backup/restore interface does not use the previously-defined
BackupDataInput / BackupDataOutput classes, because those classes
provide an API designed for incremental key/value data structuring.
Instead, a new FullBackupDataOutput class has been introduced, through
which we restrict apps' abilities to write data during a full backup
operation to *only* writing entire on-disk files via a new BackupAgent
method called fullBackupFile().

"FullBackupAgent" exists now solely as a concrete shell class that
can be instantiated in the case of apps that do not have their own
BackupAgent implementations.

Along with the API change, responsibility for backing up the .apk
file and OBB container has been moved into the framework rather than
have the application side of the transaction do it.

Change-Id: I12849b06b1a6e4c44d080587c1e9828a52b70dae
 2011-07-06 14:40:32 -07:00
Shimeng (Simon) Wang
1bf0456b29 Treat restored defaultScale as overview. 
Since usually restored defaultScale means previous scale is not saved.

issue: 4975315
Change-Id: Icc34469d0459fb5254567fe9f3cc5032b6349405
 2011-07-06 14:30:38 -07:00
Isaac Levy
a7bc1135c2 Moved WifiWatchdogService and DnsPinger 
- Moved WWS and DnsPinger in prep for StateMachine rewrite
 intent.

Change-Id: I912ca80d31ee2ded99eb345a2e5a55d01bd9910c
 2011-07-06 13:54:48 -07:00
Irfan Sheriff
aadfed5308 Merge "Log supplicant restart count correctly" 2011-07-06 13:42:42 -07:00
Jason Sams
04a3ae0d30 Merge "docs: Re-write of OpenGL Framework topic bug 4285030" 2011-07-06 13:29:29 -07:00
Brian Carlstrom
be87cc945b Merge "Adding additional details to ssl_certificate view" 2011-07-06 12:39:25 -07:00
Robert Ly
31ee77eb2a cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052 
Change-Id: I57ea8e2ace24a777603513340302265138711590
 2011-07-06 12:22:21 -07:00
Wink Saville
5eeeea29ec am 97667d0c: Merge "Allow vril-dump to work on user builds" into honeycomb-LTE 
* commit '97667d0cb3d5aecca7210c70a302f7a667330708':
  Allow vril-dump to work on user builds
 2011-07-06 12:09:48 -07:00
Wink Saville
97667d0cb3 Merge "Allow vril-dump to work on user builds" into honeycomb-LTE 2011-07-06 12:08:05 -07:00
Brian Carlstrom
4a06281052 Adding additional details to ssl_certificate view 
Change-Id: I3da80988b749fe60174c3c8df856d714ede518ba
 2011-07-06 12:07:41 -07:00
Glenn Kasten
5161eb7b23 Merge "Add Thread::join" 2011-07-06 11:37:53 -07:00
Robert Ly
f870327d5d am bc45fcbb: am 205d1c34: cherrypicking tools and adt r12 relnotes from hc-mr1 Change-Id: I0ea492417581c062f6433e23345fe3fe398709c0 
* commit 'bc45fcbb44fb6af0e99446c0e56eba8238de9e90':
  cherrypicking tools and adt r12 relnotes from hc-mr1 Change-Id: I0ea492417581c062f6433e23345fe3fe398709c0
 2011-07-06 11:26:27 -07:00
Robert Ly
bc45fcbb44 am 205d1c34: cherrypicking tools and adt r12 relnotes from hc-mr1 Change-Id: I0ea492417581c062f6433e23345fe3fe398709c0 
* commit '205d1c34e3289b05700e6caab718de169ad82b90':
  cherrypicking tools and adt r12 relnotes from hc-mr1 Change-Id: I0ea492417581c062f6433e23345fe3fe398709c0
 2011-07-06 11:22:20 -07:00
Mathias Agopian
55aaccd7e8 Merge "don't kill surfaceflinger when system process dies" 2011-07-06 11:10:31 -07:00
Mathias Agopian
7893c5e83c Merge "fix ScreenshotsOfProtectedBuffersFail" 2011-07-06 11:10:06 -07:00
Mathias Agopian
7eef784ea9 Merge "return an error code with gralloc buffer allocation failures" 2011-07-06 11:09:55 -07:00
Chet Haase
5f517c149f Merge "Minor ADK guide doc fixes." 2011-07-06 11:00:19 -07:00
Mike Lockwood
629b149ff5 UsbDeviceManager: Initialize RNDIS ethernet address based on device serial number 
Change-Id: I4775e5d8350385777f70f1b28ac00aa22dbd9487
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-07-06 12:52:49 -04:00
John Michelau
790d2e4d69 Allow vril-dump to work on user builds 
Run vril-dump without "su root" when ro.build.type=user.  Also add inet
perms for dumpstate, so that it can communicate with basebands that
have IP-based interfaces.

Bug: 4993955
Change-Id: Icc65ba0f80756db1f63f12f89f9973a55bf405f2
 2011-07-06 09:30:28 -07:00
Gloria Wang
2da9eb7175 Merge "- Retrieve is_drm in MediaMetadataRetriever. - Add one more column in MediaStore to indicate whether a media file is drm-protected. - Remove old DRM code from Ringtone - Use the new DRM code in RingtoneManager" 2011-07-06 09:22:05 -07:00
Chet Haase
ac8ebfccc3 Minor ADK guide doc fixes. 
Change-Id: I3e2966c6f6b1ef309dffdb6089abe69e36ec8bb2
 2011-07-06 08:59:14 -07:00
Justin Ho
4481c35567 Merge "Updated Action Bar up affordance and menu button, refresh of ic_menu from designer tree Adding all xhdpi versions of these assets as well." 2011-07-06 08:04:06 -07:00
Mike Lockwood
2776f6975d Merge "UsbService: USB connected notification now redirects to USB screen in Settings" 2011-07-06 07:59:47 -07:00
Mike Lockwood
a2e66343b6 Merge "Revert "USB connected notification and temporary USB options dialog"" 2011-07-06 07:59:36 -07:00
Robert Greenwalt
37dbfcaf83 am 7022db4c: am 2b62c4fb: am 38bb0123: Merge "Added methods to support dns cache per interface" 
* commit '7022db4cd2ca3721631595d7379eabb2cc77f6a9':
  Added methods to support dns cache per interface
 2011-07-06 07:48:21 -07:00
Robert Greenwalt
7022db4cd2 am 2b62c4fb: am 38bb0123: Merge "Added methods to support dns cache per interface" 
* commit '2b62c4fbfeb7df0988bf216c50cd4a24f05add9f':
  Added methods to support dns cache per interface
 2011-07-06 07:42:19 -07:00
Robert Greenwalt
2b62c4fbfe am 38bb0123: Merge "Added methods to support dns cache per interface" 
* commit '38bb0123b8b9857c3119fd359739daf872f619d6':
  Added methods to support dns cache per interface
 2011-07-06 07:35:02 -07:00
Mike Lockwood
07cac12ca0 Merge "Associate WebP Mime-Type with FILE_TYPE_WEBP." 2011-07-06 05:05:32 -07:00
Vikas Arora
7f61f5919d Associate WebP Mime-Type with FILE_TYPE_WEBP. 
The last change for adding WEBP Mime-Type
(https://android-git.corp.google.com/g/#change,112919) had this bug.
Fixing the bug in this change.

Change-Id: I084b66de4aabb3892fb0e6fa36062a52d4dcc224
 2011-07-06 16:48:18 +05:30
Narayan Kamath
42de13c3b0 Merge "Add a sample app for the TTS engine API" 2011-07-06 02:01:59 -07:00
Narayan Kamath
e074e221a8 Merge "Minor changes to AudioTrack handling" 2011-07-06 02:01:48 -07:00
Glenn Kasten
4431c05f13 Merge "Thread ID zero for androidSetThreadSchedulingGroup" 2011-07-05 15:08:31 -07:00
Narayan Kamath
9637198699 Minor changes to AudioTrack handling 
Based on a discussion with the media folks.

Change-Id: I290cec062fcb53fccae1fd92387439448a54e81c
 2011-07-05 15:46:53 +01:00
Steve Block
324a1f6a12 Merge "Clarify the documentation for WebView.loadDataWithBaseURL() when the base URL uses the 'data' scheme" 2011-07-05 07:43:56 -07:00
Steve Block
b4db3964f1 Merge "Maintain a reference to the Java object when WebView.removeJavascriptInterface() is called" 2011-07-05 06:34:57 -07:00
Debashish Chatterjee
331b6c4316 Merge "Introduced a common SOURCE_PACKAGE_FIELD in VoicemailContract class." 2011-07-05 01:45:44 -07:00
Debashish Chatterjee
1752ae72ce Introduced a common SOURCE_PACKAGE_FIELD in VoicemailContract class. 
This ensures that we use the same field name for both status and
voicemail tables.

Change-Id: I9f699939b8434bd41b5382e49dea63516cfce346
 2011-07-05 09:13:30 +01:00
satok
75c6ddf3fa Merge "Fix NPE in getLastInputMethodSubtype" 2011-07-04 21:48:47 -07:00
satok
0e7d7d6323 Fix NPE in getLastInputMethodSubtype 
Bug: 4991393
Change-Id: I4ced2a2ca4815c7cee84a72dc6131fb8c4ee7216
 2011-07-05 13:32:15 +09:00
Hung-ying Tyan
3eeb1a98f9 Merge "Keep last known keepalive interval to avoid duplicate effort." 2011-07-04 20:37:33 -07:00
Debashish Chatterjee
5de53944e0 Merge "Got rid of deprecated fields from VoicemailContract api." 2011-07-04 10:45:33 -07:00
Steve Block
e482d89b82 Clarify the documentation for WebView.loadDataWithBaseURL() when the base URL uses the 'data' scheme 
Bug: 4726284
Change-Id: If4fd3c1a6517a69e0b007f8a67563330eca04449
 2011-07-04 18:25:01 +01:00
Steve Block
3af08a975a Merge "Clarify documentation for WebView.loadData()" 2011-07-04 10:06:31 -07:00
Debashish Chatterjee
9b8dd63445 Got rid of deprecated fields from VoicemailContract api. 
No one should now be using these fields. SOURCE_CONTENT_URI was not
marked deprecated, but following a recent change in content provider
this field is also no more in use.

Change-Id: I58bb7872ba2f6cec169499d1a01d755232dde2f0
 2011-07-04 15:19:23 +01:00
Steve Block
b28b22af13 Clarify documentation for WebView.loadData() 
This method can access the network, but is subject to the usual same
origin policy.

Bug: 4985285
Change-Id: Ia3afa6ed1eeea9127d3ba5a2ecfead8149138b8e
 2011-07-04 13:01:25 +01:00
Steve Block
2cb978e507 Maintain a reference to the Java object when WebView.removeJavascriptInterface() is called 
The Java object should remain usable until the WebView is navigated
away from the current page. The native side holds only a weak
reference, so we need to keep a reference Java-side.

Bug: 4990734
Change-Id: I40bd078f779228480cfe6f52d9feb4e60c963b4b
 2011-07-04 12:19:17 +01:00