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

2877 Commits

Author SHA1 Message Date
Jason Sams
9dd9d02189 Merge "Expose unchecked copyFrom variants." into honeycomb 2011-01-19 16:27:06 -08:00
Mike Lockwood
983b319a8a am 3c1f64c4: am 62097ad6: Merge "@hide MediaStore.ACTION_MTP_SESSION_END" into honeycomb 
* commit '3c1f64c4ad8fa9d81bdbeb0b505730bf5003916f':
  @hide MediaStore.ACTION_MTP_SESSION_END
 2011-01-19 16:14:16 -08:00
Mike Lockwood
3c1f64c4ad am 62097ad6: Merge "@hide MediaStore.ACTION_MTP_SESSION_END" into honeycomb 
* commit '62097ad654bcab30057f56b46bbac5c41cfe9ec0':
  @hide MediaStore.ACTION_MTP_SESSION_END
 2011-01-19 16:11:55 -08:00
Mike Lockwood
62097ad654 Merge "@hide MediaStore.ACTION_MTP_SESSION_END" into honeycomb 2011-01-19 16:09:49 -08:00
Mike Lockwood
e222872a77 @hide MediaStore.ACTION_MTP_SESSION_END 
BUG: 3370230

Change-Id: Idc05512930ceab8f91e3ddf0969a3b17deab2f62
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-19 16:07:25 -08:00
Jason Sams
4fa3eed8e0 Expose unchecked copyFrom variants. 
Change-Id: I452d082bb4adbd578b6300bf5829dc59e91e517a
 2011-01-19 15:44:38 -08:00
Brad Fitzpatrick
28d5206519 am bd80a12c: resolved conflicts for merge of 9240f16d to honeycomb-plus-aosp 
* commit 'bd80a12cba480a0dbb2e9073f35c758d8b396b94':
  StrictMode: class instance limits (track object "leaks")
 2011-01-19 15:24:02 -08:00
Brad Fitzpatrick
bd80a12cba resolved conflicts for merge of 9240f16d to honeycomb-plus-aosp 
Change-Id: I6e595bb11a5a692ccd730b9d1d2aa367063a61f5
 2011-01-19 15:19:08 -08:00
Brad Fitzpatrick
9240f16d77 Merge "StrictMode: class instance limits (track object "leaks")" into honeycomb 2011-01-19 14:53:24 -08:00
Brad Fitzpatrick
bfbe577110 StrictMode: class instance limits (track object "leaks") 
Change-Id: I2db5a19060c2013078feb88a91caf655469b2f98
 2011-01-19 14:52:08 -08:00
Svetoslav Ganov
9df9ee7491 am 1ebd8c11: am 4243dc39: Updated the Time/Date pickers to be backwards compatible 
* commit '1ebd8c11f73625050035b4fca35841a9e30bca04':
  Updated the Time/Date pickers to be backwards compatible
 2011-01-19 12:39:56 -08:00
Svetoslav Ganov
1ebd8c11f7 am 4243dc39: Updated the Time/Date pickers to be backwards compatible 
* commit '4243dc394d89a93cb207efa36e9755c2424d688b':
  Updated the Time/Date pickers to be backwards compatible
 2011-01-19 12:37:36 -08:00
Svetoslav Ganov
4243dc394d Updated the Time/Date pickers to be backwards compatible 
bug:3349400

Change-Id: I2a3dda82caf7de0ed203306c89ee774b94b7d82e
 2011-01-19 12:35:17 -08:00
Adam Cohen
18f8e6fc61 am 9f97174b: am c446ae83: Merge "Removing deprecated widget api method." into honeycomb 
* commit '9f97174b9b5048b6ea2f9c8cf9e99df76185f4c4':
  Removing deprecated widget api method.
 2011-01-19 11:51:42 -08:00
Adam Cohen
9f97174b9b am c446ae83: Merge "Removing deprecated widget api method." into honeycomb 
* commit 'c446ae83e08fb451589dbacba9aa3f89d0d6acb0':
  Removing deprecated widget api method.
 2011-01-19 11:49:44 -08:00
Winson Chung
0fd9be2118 Removing deprecated widget api method. 
Change-Id: I0610dcb5cf1001b2b7e86d78a88addf174cedd77
 2011-01-19 11:44:25 -08:00
Jean-Michel Trivi
d2760821e9 am 3ebe75cc: am 928e48f2: Merge "Fix bug 2084122: enable application control over text synth volume" into honeycomb 
* commit '3ebe75cc51a268b273d63591c3035e03f2b68800':
  Fix bug 2084122: enable application control over text synth volume
 2011-01-19 09:17:27 -08:00
Jean-Michel Trivi
3ebe75cc51 am 928e48f2: Merge "Fix bug 2084122: enable application control over text synth volume" into honeycomb 
* commit '928e48f2bae9816fb5b3f1444f8ca9a4de15d8c3':
  Fix bug 2084122: enable application control over text synth volume
 2011-01-19 09:14:57 -08:00
Jean-Michel Trivi
928e48f2ba Merge "Fix bug 2084122: enable application control over text synth volume" into honeycomb 2011-01-19 09:13:04 -08:00
Winson Chung
a726143937 am caedec76: am aac19783: Merge "Refactoring app widgets to address security/performance issues." into honeycomb 
* commit 'caedec768bf22acc38e526b9cec655ea8f9eede0':
  Refactoring app widgets to address security/performance issues.
 2011-01-18 23:08:11 -08:00
Winson Chung
caedec768b am aac19783: Merge "Refactoring app widgets to address security/performance issues." into honeycomb 
* commit 'aac197833f3b2deddc6b3da5c144be36721d9547':
  Refactoring app widgets to address security/performance issues.
 2011-01-18 23:05:38 -08:00
Winson Chung
81f39eb6e7 Refactoring app widgets to address security/performance issues. 
- Moving the service binding to AppWidgetService to prevent arbitrary apps from binding to widget services
- Requiring RemoteViewsServices to require android.permission.BIND_REMOTEVIEWS permission

Change-Id: Id135bafba998299eb278067712b8a5d8487cfd04
 2011-01-18 22:57:09 -08:00
Christopher Tate
a953359db5 am 31cd02ad: am 17ed60c3: API CHANGE: add a no-View ctor for DragShadowBuilder 
* commit '31cd02ade3dd85c676bb278a1c2181f57179c390':
  API CHANGE: add a no-View ctor for DragShadowBuilder
 2011-01-18 21:58:32 -08:00
Jack Palevich
1e686175a6 am 79f74eda: am a228e4f8: Merge "Unhide GLSurfaceView.get/setPreserveEGLContextOnPause" into honeycomb 
* commit '79f74eda8a6ba96519bb3a084f656fcacb1cd2e7':
  Unhide GLSurfaceView.get/setPreserveEGLContextOnPause
 2011-01-18 21:58:11 -08:00
Nick Pelly
5a6e65ed2e am b6b426ad: Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into honeycomb-plus-aosp 
* commit 'b6b426ad1c953555dd6393844c29be5c9a9cd700':
  Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)
 2011-01-18 21:57:31 -08:00
Dianne Hackborn
7fc5d4b8e7 am 2ec5a716: am 36c84403: Merge "Fix issue #3362484: Can\'t dismiss activity picker by tapping outside dialog" into honeycomb 
* commit '2ec5a7160b3d32887b2428edef7a751ee3700809':
  Fix issue #3362484: Can't dismiss activity picker by tapping outside dialog
 2011-01-18 21:56:45 -08:00
Brad Fitzpatrick
aef99bbc69 am 7adf8481: am b4f655d5: Merge "StrictMode class instance limit interface." into honeycomb 
* commit '7adf848183b39ac4d0b8b67435ace94909ca3076':
  StrictMode class instance limit interface.
 2011-01-18 21:50:45 -08:00
Nick Pelly
e5099cd3f5 am b7d6ffd7: Merge "Change signature of MifareClassic.authenticate*() to throw IOException." into gingerbread 
* commit 'b7d6ffd76f6c47af488494f5de9560ec490e8241':
  Change signature of MifareClassic.authenticate*() to throw IOException.
 2011-01-18 18:56:45 -08:00
Nick Pelly
0316d4a24f Change signature of MifareClassic.authenticate*() to throw IOException. 
Update API for this and the previous commit.

Change-Id: I19275a5d00081bd0f00afea59a2b673344a32954
 2011-01-18 18:52:37 -08:00
Christopher Tate
31cd02ade3 am 17ed60c3: API CHANGE: add a no-View ctor for DragShadowBuilder 
* commit '17ed60c3d2e480ab9788b445958a22b9ae7b6e96':
  API CHANGE: add a no-View ctor for DragShadowBuilder
 2011-01-18 18:36:06 -08:00
Jack Palevich
79f74eda8a am a228e4f8: Merge "Unhide GLSurfaceView.get/setPreserveEGLContextOnPause" into honeycomb 
* commit 'a228e4f833b96e0633571735c2363e30363e155c':
  Unhide GLSurfaceView.get/setPreserveEGLContextOnPause
 2011-01-18 18:35:42 -08:00
Nick Pelly
b6b426ad1c Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into honeycomb-plus-aosp 2011-01-18 16:10:48 -08:00
Christopher Tate
17ed60c3d2 API CHANGE: add a no-View ctor for DragShadowBuilder 
Cf conversation with the API council.  Also expand the javadoc
a bit.

Change-Id: I9d4edb1042e00492b3db5c6bb7c7d9648581efad
 2011-01-18 16:07:06 -08:00
Jack Palevich
a228e4f833 Merge "Unhide GLSurfaceView.get/setPreserveEGLContextOnPause" into honeycomb 2011-01-18 15:54:29 -08:00
Jack Palevich
75f2bc04df Unhide GLSurfaceView.get/setPreserveEGLContextOnPause 
Change-Id: I882b8fa7888e2baae41c81b75af7fc1f639d38d6
 2011-01-18 15:53:25 -08:00
Nick Pelly
06a00bd2d2 Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int) 
The later feels less clumsy.

Change-Id: I1bad37031c5d57f51b04c8ea6e41805dcd2935ec
 2011-01-18 15:39:34 -08:00
Dianne Hackborn
2ec5a7160b am 36c84403: Merge "Fix issue #3362484: Can\'t dismiss activity picker by tapping outside dialog" into honeycomb 
* commit '36c84403ec07439d11ed284ac5f9a9db807fbf92':
  Fix issue #3362484: Can't dismiss activity picker by tapping outside dialog
 2011-01-18 15:32:44 -08:00
Dianne Hackborn
36c84403ec Merge "Fix issue #3362484: Can't dismiss activity picker by tapping outside dialog" into honeycomb 2011-01-18 15:31:21 -08:00
Dianne Hackborn
cfaf8878de Fix issue #3362484: Can't dismiss activity picker by tapping outside dialog 
Change-Id: Idc2fe5a86c61e8f94fe9d902a0087a05f6f7918e
 2011-01-18 15:28:41 -08:00
Brad Fitzpatrick
7adf848183 am b4f655d5: Merge "StrictMode class instance limit interface." into honeycomb 
* commit 'b4f655d5912869078cb7be29d108ebfea06019fc':
  StrictMode class instance limit interface.
 2011-01-18 13:13:07 -08:00
Brad Fitzpatrick
b4f655d591 Merge "StrictMode class instance limit interface." into honeycomb 2011-01-18 13:11:33 -08:00
John Reck
14ae0cb842 am 3977afe4: am d00207ff: Merge "WebStorage public API change" into honeycomb 
* commit '3977afe41679290fedbe661e53dcf360136f52d0':
  WebStorage public API change
 2011-01-18 12:10:22 -08:00
Dmitri Plotnikov
016c6daff0 am b92d08a7: am 48395385: Merge "Hiding the AsyncTaskLoader.waitForLoader method" into honeycomb 
* commit 'b92d08a7385f241722b2299a988ab7a55053f6ea':
  Hiding the AsyncTaskLoader.waitForLoader method
 2011-01-18 12:10:07 -08:00
Brad Fitzpatrick
758035757f StrictMode class instance limit interface. 
Change-Id: Ic5eea539586e5d4965d83364bf9f623d1d89f2b1
 2011-01-18 11:38:37 -08:00
Martijn Coenen
3d06b1e0e9 am a701cf85: Implement IsoDep timeout handling (API). 
* commit 'a701cf85a0167a6bb623343388a7dca6f2b61ac5':
  Implement IsoDep timeout handling (API).
 2011-01-18 11:38:28 -08:00
Martijn Coenen
a701cf85a0 Implement IsoDep timeout handling (API). 
Added a method for setting the timeout on IsoDep transactions.

Change-Id: Ie627e7a826556e46295fefe69b9be83ebf911d93
 2011-01-18 11:35:46 -08:00
Jeff Hamilton
97ac293507 am 0716ea14: Merge "Javadoc updates for NFC." into gingerbread 
* commit '0716ea144d94b9dfce4670e90a849db19a492da9':
  Javadoc updates for NFC.
 2011-01-18 11:26:39 -08:00
Jeff Hamilton
8c1cd157fb am 3a223404: Merge "New APIs for NDEF Push Protocol." into gingerbread 
* commit '3a223404e7589831a901cb16c5ce97685bc1f3f8':
  New APIs for NDEF Push Protocol.
 2011-01-18 11:26:22 -08:00
John Reck
3977afe416 am d00207ff: Merge "WebStorage public API change" into honeycomb 
* commit 'd00207ff87fa3e2d5430ea5c0980041c44738efe':
  WebStorage public API change
 2011-01-18 11:18:59 -08:00
Dmitri Plotnikov
b92d08a738 am 48395385: Merge "Hiding the AsyncTaskLoader.waitForLoader method" into honeycomb 
* commit '48395385039a0c845bba8913c8d0c76981425aa4':
  Hiding the AsyncTaskLoader.waitForLoader method
 2011-01-18 11:18:37 -08:00