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

179299 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
b63166afd3 am c632031a: am 27195338: am 546a0e8c: am 60925265: am afc3b9e7: Merge "docs: studio build output dir name update" into lmp-docs 
automerge: 7cf74ee

* commit '7cf74ee6e2c51afaf07e29f8597475ec289a20ed':
  docs: studio build output dir name update
 2015-01-06 20:01:43 +00:00
Joe Fernandez
6d2dcbbd30 am 06cdc2fd: am 851931f0: am 21b92f34: am 43f4e8fa: am 27cb0a56: Merge "docs: gradle version update in plugin file" into lmp-docs 
automerge: 629612a

* commit '629612a9d2d1a52809cd0549a1b6d2cbcf1a3d09':
  docs: gradle version update in plugin file
 2015-01-06 19:58:32 +00:00
Joe Fernandez
414d895c11 am 4dc7c158: am 3dcc1289: am 447ea509: am f110d357: am 8eaf4042: Merge "docs: gradle wrapper security note" into lmp-docs 
automerge: 148a578

* commit '148a57877ec5272a6768f427bd280a4d9c18acb1':
  docs: gradle wrapper security note
 2015-01-06 19:56:46 +00:00
Nick Kralevich
cfea9fbc53 resolved conflicts for merge of 175ef812 to master 
Change-Id: I2c6f407fa56b13c54571f8a51573a4b45d251dbb
 2015-01-06 11:50:08 -08:00
Joe Fernandez
17197b856b am e7558b44: am 596868b6: am c811b88a: am d3d09d87: am 66e851fa: Merge "docs: studio workflow links" into lmp-docs 
automerge: 8109599b

* commit '8109599b1c6306d1f2239a88f0cf9ba3ea584f2b':
  docs: studio workflow links
 2015-01-06 19:36:41 +00:00
Nick Kralevich
0e55e3565e resolved conflicts for merge of 1779fd15 to master 
Change-Id: I36b60b943a9cfe53bbbf455cf4e94579bfbfbc69
 2015-01-06 11:29:44 -08:00
Christopher Tate
ad02e38b63 am 0a511d33: am 1c6014e7: Merge "Remove the "backup_data_changed" event log" into lmp-mr1-dev 
* commit '0a511d33b0a7887baab95c39fd5889efad1962b1':
  Remove the "backup_data_changed" event log
 2015-01-06 19:19:07 +00:00
Dianne Hackborn
3d44382aca am 6f36bd3a: am 5fe8197f: Merge "Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit" into lmp-mr1-dev 
* commit '6f36bd3a00a4708c425874764b63f0240e799cfd':
  Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit
 2015-01-06 19:19:00 +00:00
Alan Viverette
f4c068b72e Add getDither, getFilterBitmap to Drawable for CTS testing 
Also removes unnecessary overrides from PictureDrawable.

Change-Id: I13539b5204e8c0d8b9912da14de7ceae62720e3f
 2015-01-06 11:01:36 -08:00
Alan Viverette
304ea5aac7 Merge "Allow use of theme attributes in color state lists" 2015-01-06 18:47:29 +00:00
Christopher Tate
0a511d33b0 am 1c6014e7: Merge "Remove the "backup_data_changed" event log" into lmp-mr1-dev 
* commit '1c6014e77dfad1a7af229d642df7b7300beee721':
  Remove the "backup_data_changed" event log
 2015-01-06 18:16:43 +00:00
Christopher Tate
1c6014e77d Merge "Remove the "backup_data_changed" event log" into lmp-mr1-dev 2015-01-06 18:09:41 +00:00
Dianne Hackborn
6f36bd3a00 am 5fe8197f: Merge "Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit" into lmp-mr1-dev 
* commit '5fe8197fde93f659acbbbdd5dda9c7eac69c468f':
  Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit
 2015-01-06 18:07:26 +00:00
Dianne Hackborn
5fe8197fde Merge "Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit" into lmp-mr1-dev 2015-01-06 18:00:00 +00:00
Olawale Ogunwale
59820738fd am d8aa4660: am da90a9c2: Merge "Do not allow the navigation bar to move if width == height" 
* commit 'd8aa4660b02b8a4a51e3ddbd347c306c41339576':
  Do not allow the navigation bar to move if width == height
 2015-01-06 16:56:46 +00:00
Olawale Ogunwale
d8aa4660b0 am da90a9c2: Merge "Do not allow the navigation bar to move if width == height" 
* commit 'da90a9c2355841bb98c2a669446b93ffe487a829':
  Do not allow the navigation bar to move if width == height
 2015-01-06 16:50:56 +00:00
Olawale Ogunwale
da90a9c235 Merge "Do not allow the navigation bar to move if width == height" 2015-01-06 16:43:56 +00:00
Paul Jensen
932bfab9aa am 6c93739f: am 9ffb53cb: Clear process DNS NetID binding when expiring or releaseing legacy requests. 
* commit '6c93739f2f25c8afb77997165fa86be537df67a9':
  Clear process DNS NetID binding when expiring or releaseing legacy requests.
 2015-01-06 14:57:44 +00:00
Paul Jensen
6c93739f2f am 9ffb53cb: Clear process DNS NetID binding when expiring or releaseing legacy requests. 
* commit '9ffb53cb1131eeac5c246e7378455bb4b64293f5':
  Clear process DNS NetID binding when expiring or releaseing legacy requests.
 2015-01-06 14:49:09 +00:00
Paul Jensen
9ffb53cb11 Clear process DNS NetID binding when expiring or releaseing legacy requests. 
When requests made by ConnectivityManager.startUsingNetworkFeature() are
expired or are canceled via ConnectivityManager.stopUsingNetworkFeature(),
we must remember to clear the binding of DNS requests from the calling
process to the Network satisfying the request.

bug:18778725
Change-Id: I800c808ac6486000241b5d263aa79a1192a9fe9e
 2015-01-06 09:43:04 -05:00
Narayan Kamath
031acc4b39 am 3787decd: am 5137415e: Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod." 
* commit '3787decd8d41320ec9201405ec4cc893b2c99d78':
  Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod.
 2015-01-06 10:16:34 +00:00
Narayan Kamath
721d0994dc am f60b2d40: am 024191b5: Merge "Fix comment. It should be \'or\' not \'of\'." 
* commit 'f60b2d40b0b8dea2c83335c00fd7767008aa0abe':
  Fix comment.  It should be 'or' not 'of'.
 2015-01-06 10:16:23 +00:00
Narayan Kamath
3787decd8d am 5137415e: Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod." 
* commit '5137415e391d8491d92535b17445ab646a3fcb5d':
  Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod.
 2015-01-06 10:10:09 +00:00
Narayan Kamath
f60b2d40b0 am 024191b5: Merge "Fix comment. It should be \'or\' not \'of\'." 
* commit '024191b57f2165e4d0c2c579f95046d491feacb5':
  Fix comment.  It should be 'or' not 'of'.
 2015-01-06 10:09:59 +00:00
Narayan Kamath
5137415e39 Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod." 2015-01-06 10:06:06 +00:00
Haitao Feng
8bd6a203ca Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod. 
CallStaticVoidMethod is varargs function, and calling it with
a literal 0 like CallStaticVoidMethod(..., 0) will treat the
argument as a 4 byte int in both 32 and 64 bit processes.

This is incorrect for pointer arguments where NULL should be
used instead.

Reviewed-by: Liao, Bruce <bruce.liao@intel.com>
Signed-off-by: Yong Yao <yong.yao@intel.com>

Change-Id: I9d700d3790a80dbee6826f64baf9ef5d81ca390f
 2015-01-06 09:57:13 +00:00
Narayan Kamath
024191b57f Merge "Fix comment. It should be 'or' not 'of'." 2015-01-06 09:46:17 +00:00
Jinsuk Kim
30a061ed4f am e96f9dd1: am b0b4921b: Merge "CEC: Make deviceSelect work for MHL device" into lmp-mr1-dev 
* commit 'e96f9dd1a43e401ae3a73ac2b32bac6b6da2fe23':
  CEC: Make deviceSelect work for MHL device
 2015-01-06 04:12:50 +00:00
Jinsuk Kim
e96f9dd1a4 am b0b4921b: Merge "CEC: Make deviceSelect work for MHL device" into lmp-mr1-dev 
* commit 'b0b4921bcbb0619587509b882d33da52ebb98106':
  CEC: Make deviceSelect work for MHL device
 2015-01-06 04:06:35 +00:00
Jinsuk Kim
b0b4921bcb Merge "CEC: Make deviceSelect work for MHL device" into lmp-mr1-dev 2015-01-06 04:03:21 +00:00
Jinsuk Kim
6ad7cbde22 CEC: Make deviceSelect work for MHL device 
MHL device works on hotplug but not when API deviceSelect is invoked
to select it due to a bug not finding the right MHL device instance.
This CL rectifies it by searching for not only CEC but MHL devices
attached to TV.

Bug: 18909552
Change-Id: I4df1ead836090eb3a7476b7738be47a6970edb7d
 2015-01-06 11:52:14 +09:00
Ricardo Cervera
2b2ad7ce9f am 4d4b599d: am ac4444a2: am c5fae959: am 48a066db: am 60cfb01a: Merge "docs: Update wearable lists docs" into lmp-docs 
automerge: 0281909

* commit '02819090ece2ed8ff4161a560fcb5acb8c0b9cb5':
  docs: Update wearable lists docs
 2015-01-06 02:39:22 +00:00
Joe Fernandez
1b0c367a32 am bea6f1e6: am b1062ad6: am c3fb32ab: am 4603c122: am 18a75595: Merge "docs: studio device emulator updates" into lmp-docs 
automerge: 66a49d9

* commit '66a49d994c997e74fcab7ce5b4e334cfd742d36c':
  docs: studio device emulator updates
 2015-01-06 02:37:41 +00:00
Sarah Maddox
041855e06d am 73c943fc: am 15e94fdf: am 4811f9b8: am ecf0ac29: am ca23a587: Merge "docs: Updates the request-location-updates lesson in the location APIs training course." into lmp-docs 
automerge: d259fb3

* commit 'd259fb3757f0813b3bb13dea9a65c6cab6617fc6':
  docs: Updates the request-location-updates lesson in the location APIs training course.
 2015-01-06 02:35:42 +00:00
Ricardo Cervera
509bd3a959 am fd731d4b: am fcba6472: am 9719336b: am 4ef7873d: am 8e631d2d: Merge "docs: Adding vector drawables video" into lmp-docs 
automerge: 2d90b49

* commit '2d90b49ad2caa3f765ed9b4b8eab31da711f4d19':
  docs: Adding vector drawables video
 2015-01-06 02:34:17 +00:00
Joe Fernandez
f7f6bbc319 am 5ec2afea: am f3d9f030: am adaef486: am e78489b4: am e22b42b3: Merge "docs: plugin reference update" into lmp-docs 
automerge: 4d0c931

* commit '4d0c931be7b63ebcd5789b99c5f561b411823485':
  docs: plugin reference update
 2015-01-06 02:32:24 +00:00
Andrew Solovay
7dd1f66bb6 am eeaf280d: am ff62a5ee: am 4c7390d3: am b663f2fc: am 713cd74e: docs: New "app compatibility with managed profiles" doc 
* commit 'eeaf280dc7e1feab293e0bf35398b45009c9f5b2':
  docs: New "app compatibility with managed profiles" doc
 2015-01-06 02:27:02 +00:00
Joe Fernandez
7cf74ee6e2 am c632031a: am 27195338: am 546a0e8c: am 60925265: am afc3b9e7: Merge "docs: studio build output dir name update" into lmp-docs 
* commit 'c632031af3ffb5e166ad25e78d41757b9b35ce84':
  docs: studio build output dir name update
 2015-01-06 02:26:55 +00:00
Joe Fernandez
629612a9d2 am 06cdc2fd: am 851931f0: am 21b92f34: am 43f4e8fa: am 27cb0a56: Merge "docs: gradle version update in plugin file" into lmp-docs 
* commit '06cdc2fd640c37b7251bc5ce37051e4da0b3552a':
  docs: gradle version update in plugin file
 2015-01-06 02:26:49 +00:00
Joe Fernandez
148a57877e am 4dc7c158: am 3dcc1289: am 447ea509: am f110d357: am 8eaf4042: Merge "docs: gradle wrapper security note" into lmp-docs 
* commit '4dc7c15860faa53f6cc408046959c7e8e6ebfd51':
  docs: gradle wrapper security note
 2015-01-06 02:26:44 +00:00
Joe Fernandez
175ef8121b am 24a3ff47: am 765ae116: am eed87a57: am 09b41c02: am e6395cd3: Merge "docs: project file and toc updates" into lmp-docs 
* commit '24a3ff477037a634e7ae6bc99908faebd530d0a9':
  docs: project file and toc updates
 2015-01-06 02:26:38 +00:00
Joe Fernandez
8109599b1c am e7558b44: am 596868b6: am c811b88a: am d3d09d87: am 66e851fa: Merge "docs: studio workflow links" into lmp-docs 
* commit 'e7558b44f707979cb4f85b0ccd0862b9ea068ee6':
  docs: studio workflow links
 2015-01-06 02:26:32 +00:00
Joe Fernandez
1779fd1514 am d1489d5d: am a78664e0: am 411c779b: am c919f7cf: am 1092bafa: Merge "docs: studio tips and ticks grammmar typo" into lmp-docs 
* commit 'd1489d5db00d030b873fe84f32fa5bd453152824':
  docs: studio tips and ticks grammmar typo
 2015-01-06 02:26:25 +00:00
Ricardo Cervera
02819090ec am 4d4b599d: am ac4444a2: am c5fae959: am 48a066db: am 60cfb01a: Merge "docs: Update wearable lists docs" into lmp-docs 
* commit '4d4b599d7c864d44267979fa71ca5b0bb27171b5':
  docs: Update wearable lists docs
 2015-01-06 02:26:18 +00:00
Joe Fernandez
66a49d994c am bea6f1e6: am b1062ad6: am c3fb32ab: am 4603c122: am 18a75595: Merge "docs: studio device emulator updates" into lmp-docs 
* commit 'bea6f1e6457841b8be4e45ecb713762894799f7a':
  docs: studio device emulator updates
 2015-01-06 02:26:11 +00:00
Sarah Maddox
d259fb3757 am 73c943fc: am 15e94fdf: am 4811f9b8: am ecf0ac29: am ca23a587: Merge "docs: Updates the request-location-updates lesson in the location APIs training course." into lmp-docs 
* commit '73c943fc71bbb35bd494b24cc649eaa168f3c1e5':
  docs: Updates the request-location-updates lesson in the location APIs training course.
 2015-01-06 02:26:05 +00:00
Ricardo Cervera
2d90b49ad2 am fd731d4b: am fcba6472: am 9719336b: am 4ef7873d: am 8e631d2d: Merge "docs: Adding vector drawables video" into lmp-docs 
* commit 'fd731d4bebed075f1c1d4130c22dbb7475ec8efe':
  docs: Adding vector drawables video
 2015-01-06 02:25:58 +00:00
Joe Fernandez
4d0c931be7 am 5ec2afea: am f3d9f030: am adaef486: am e78489b4: am e22b42b3: Merge "docs: plugin reference update" into lmp-docs 
* commit '5ec2afea01be51e5607e445c401be3296f1ac83e':
  docs: plugin reference update
 2015-01-06 02:25:47 +00:00
Andrew Solovay
eeaf280dc7 am ff62a5ee: am 4c7390d3: am b663f2fc: am 713cd74e: docs: New "app compatibility with managed profiles" doc 
* commit 'ff62a5eea743581dd0747026f09f3d73cdd4c1ea':
  docs: New "app compatibility with managed profiles" doc
 2015-01-06 02:12:48 +00:00
Joe Fernandez
c632031af3 am 27195338: am 546a0e8c: am 60925265: am afc3b9e7: Merge "docs: studio build output dir name update" into lmp-docs 
* commit '27195338192b63b62f274f11bcae57dc2788514f':
  docs: studio build output dir name update
 2015-01-06 02:12:43 +00:00