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

124643 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy McFadden
8c8efbf42b am 01127579: Merge "Remove setFlags()" 
* commit '0112757995debe0d4e3527f9f8299380b0561017':
  Remove setFlags()
 2014-02-03 16:42:11 -08:00
Andy McFadden
0112757995 Merge "Remove setFlags()" 2014-02-04 00:39:16 +00:00
Jake Hamby
8f9b33e776 Add new RIL commands to read/write NV items and reset NV config. 
Add new RIL commands and generic code cleanups.

The only changes required for OMA DM support are the
addition of five new methods in ITelephony.aidl for
reading/writing NV items and performing NV config and
radio resets (requires MODIFY_PHONE_STATE), along with
the new RIL request IDs in RILConstants.java.

Bug: 12864208
Change-Id: I958d2571580d98a49936ef2e6822e5ac086acbe2
 2014-02-03 15:52:18 -08:00
Tim Murray
15297ccfd6 am 6faecbb8: am fd71ddfd: (-s ours) am 6ceac9f0: (-s ours) am f5294ed5: (-s ours) Merge "DO NOT MERGE: Mark new util type functions as @hide in AOSP." 
* commit '6faecbb8d2b9f99d88913a0a7af592e193e8a8ae':
  DO NOT MERGE: Mark new util type functions as @hide in AOSP.
 2014-02-03 15:33:46 -08:00
Tim Murray
4e9ed22860 am 43098617: am 5d331c7c: am b1bec0d9: am 3fb6feac: Merge "Check that bound allocations are 1D" 
* commit '430986178dfcc46d84bafd8ad39a16eba30844fd':
  Check that bound allocations are 1D
 2014-02-03 15:33:43 -08:00
Tim Murray
ce2d6963fb am f593000e: am 64788f1b: am 67d9e0be: am 0cc37f4c: Merge "Fix debug context." 
* commit 'f593000eac5ace1538dca3353cffea25d01f26bb':
  Fix debug context.
 2014-02-03 15:33:38 -08:00
Tim Murray
dedbd89791 am 63aec6ac: am 4cd7f2d8: am 42e4aee5: am 0539b7b4: Merge "Enable asynchronous destruction of BaseObjs." 
* commit '63aec6acbf7b645cf193c5c53e29db174dfb8628':
  Enable asynchronous destruction of BaseObjs.
 2014-02-03 15:33:35 -08:00
Tim Murray
aef0920832 am 2ee23f3d: am 95b3568d: am 42955bab: am d8b4dd95: Merge "Fix most logging macros for context pointers." 
* commit '2ee23f3dbf5c32d3e3c45bd3740237443acd7152':
  Fix most logging macros for context pointers.
 2014-02-03 15:33:32 -08:00
Tim Murray
9925368b96 am 02eefa0f: am d642dbd8: am d39e19eb: am 351879df: Merge "Fix getBytesSize for YUV allocations." 
* commit '02eefa0f4a6e19d10eecd6ec5d368d5e7b162161':
  Fix getBytesSize for YUV allocations.
 2014-02-03 15:33:23 -08:00
Tim Murray
f71a5fb1cf am 6be5817d: am 2905039d: am 16e9362e: am 8fced317: Merge "Move RenderScript from graphics/ to new fw/base subdirectory rs." 
* commit '6be5817d4201750c60547cfd61b26e4ef07a7c4f':
  Move RenderScript from graphics/ to new fw/base subdirectory rs.
 2014-02-03 15:33:20 -08:00
Tim Murray
4887caa6aa am da1192ae: am 47f295e8: (-s ours) am 8df3ea66: am b4cf2a2a: Merge "Convert Java/JNI to 64-bit, part 2." 
* commit 'da1192ae311c3e02202ed1960e4076352ecb45c9':
  Convert Java/JNI to 64-bit, part 2.
 2014-02-03 15:33:17 -08:00
Tim Murray
d0f3844830 am 7d02a5fc: am 041c77ac: (-s ours) am 72d637e2: am e22e268e: Merge changes If93a5d78,I1957f7ac 
* commit '7d02a5fcb73e56a6751642d914cc0bfca5143aae':
  Convert Java/JNI to 64-bit, part 1.
  Add long/double read support.
 2014-02-03 15:33:14 -08:00
Tim Murray
9d4ba0b3f9 am 4e634bd3: am 923da98f: (-s ours) am bccee732: am 61eb6b55: Merge "Use Object + type in place of specific array" 
* commit '4e634bd31321471eb1f2065d3936cca668ab292c':
  Use Object + type in place of specific array
 2014-02-03 15:33:12 -08:00
Alan Viverette
9d100eb5c8 am e5aea3bb: Merge "Fix ordering of dimension caching during ImageView.setResource()" 
* commit 'e5aea3bb0c88619bea61569fc9f824741542138d':
  Fix ordering of dimension caching during ImageView.setResource()
 2014-02-03 15:33:09 -08:00
Tim Murray
b31deeb84d am e0abb661: am 4e5e654e: (-s ours) am 69914882: am e559d7ee: Merge "Utility API for creating types." 
* commit 'e0abb6616736b69437b0a9b39eeb1f883c6c0db9':
  Utility API for creating types.
 2014-02-03 15:33:06 -08:00
Tim Murray
449cf425e0 am e32f9988: am b0a79d35: am 271c3b74: am b1c1518e: Merge "Remove old hidden API." 
* commit 'e32f9988be49266436f4eb3975a4d214bd83ea7a':
  Remove old hidden API.
 2014-02-03 15:33:03 -08:00
Tim Murray
c5a671b193 am 693265ae: am a392cdf3: am 9bad32c3: am aea3b581: Merge "Remove hidden API setSurfaceTexture." 
* commit '693265ae557594c04ad51bbc20de7674835c108c':
  Remove hidden API setSurfaceTexture.
 2014-02-03 15:33:00 -08:00
Igor Murashkin
149d37adf0 am eff19d36: Merge "camera2: Revise android.sensor.maxFrameDuration definition" 
* commit 'eff19d36fcbdcf3d554b961905a54e4a01c61629':
  camera2: Revise android.sensor.maxFrameDuration definition
 2014-02-03 15:32:57 -08:00
ztenghui
b277ac2c1d am a989cb29: Merge "Fixing a bad bug when there is no real umbra" 
* commit 'a989cb29c35149b35bf8c332ba39d7167bd95d6b':
  Fixing a bad bug when there is no real umbra
 2014-02-03 15:32:53 -08:00
John Spurlock
284c23a448 am 3aad4f28: Merge "Remove unused line from PhoneWindowManager." 
* commit '3aad4f28376698c0dce78a7d08af4a616c3d5c04':
  Remove unused line from PhoneWindowManager.
 2014-02-03 15:32:50 -08:00
Dianne Hackborn
f4cb4a00b0 am e8d916c0: Merge "More battery history improvements." 
* commit 'e8d916c04c3fb40667fbacb9b6fd1c775ce00b42':
  More battery history improvements.
 2014-02-03 15:32:47 -08:00
Zhijun He
5f7c7b7f14 am 6c90d439: Merge "Camera2: Update sceneFlicker tag spec" 
* commit '6c90d439758add5981dee67674d0aafc5208f427':
  Camera2: Update sceneFlicker tag spec
 2014-02-03 15:32:43 -08:00
Zhijun He
b2f90b1dd2 am 37bac0ae: Merge "Camera2: update lens state tag specs" 
* commit '37bac0aecbf656f0d8b1f0145fbbb30743c59e9b':
  Camera2: update lens state tag specs
 2014-02-03 15:32:40 -08:00
Christopher Tate
190a0bd87f am 31b4834b: Merge "Introduce "IdleService" API to expose idle-time maintenance to apps" 
* commit '31b4834b6d5eb1e5156950930b69221819a84766':
  Introduce "IdleService" API to expose idle-time maintenance to apps
 2014-02-03 15:32:36 -08:00
Zhijun He
1a931fe5d3 am ef83738d: Merge "Camera2: Update pixelArraySize and analog sensitivity tags" 
* commit 'ef83738da65a79defc6dc4f12433b327d670127e':
  Camera2: Update pixelArraySize and analog sensitivity tags
 2014-02-03 15:32:33 -08:00
Geoff Mendal
427f65c778 am 4c2315d1: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '4c2315d10c462cbebe098cae656675a46e8cfe3d':
  Import translations. DO NOT MERGE
 2014-02-03 15:32:31 -08:00
John Spurlock
bc9a5e82bc am 53a470af: am be878d87: am b6a4926c: am 647db9fa: am 76ecd66a: am 0196e561: Fix typo in ImageView.java 
* commit '53a470af6574dea27a2701e763e6c6b10be75af7':
  Fix typo in ImageView.java
 2014-02-03 15:32:26 -08:00
Alan Viverette
37d46793c0 am edc4664d: Fix broken build in BridgeResources 
* commit 'edc4664d60af1f124d05f0a2b6ba58b837630f51':
  Fix broken build in BridgeResources
 2014-02-03 15:32:18 -08:00
Kenny Root
606dbee41e am faa1057d: am aa6ff54e: am 85ee57d1: am c064a1b5: Merge "Remove DRLCertFactory" 
* commit 'faa1057d4c6cc3941e42d93399fa9cf511c09370':
  Remove DRLCertFactory
 2014-02-03 15:32:15 -08:00
Alan Viverette
98492c9395 am c8577b38: Merge "Revert "Cache display lists for Drawables"" 
* commit 'c8577b384a0e0e04eed6d05660e013b5db47b7f2':
  Revert "Cache display lists for Drawables"
 2014-02-03 15:32:10 -08:00
Alan Viverette
3c446eefd3 am fe0ea8c2: Merge "Allow specification of View theme override as a theme attribute" 
* commit 'fe0ea8c21fe6f6cbaa0594295ec371efca4af824':
  Allow specification of View theme override as a theme attribute
 2014-02-03 15:32:07 -08:00
Alan Viverette
6b7611e3ac am 14a11eee: Merge "Simplify GradientDrawable\'s use of ColorStateList" 
* commit '14a11eeeff3efd5458754785a7c48bbcf68122ef':
  Simplify GradientDrawable's use of ColorStateList
 2014-02-03 15:32:04 -08:00
John Spurlock
47845b1b4d am 17b79985: am 47e276db: am cbd156c1: Merge "Update READ&WRITE_DREAM_STATE to signature|system." into klp-modular-dev 
* commit '17b79985f4e5e6b696320e29f665adb796a2aef5':
  Update READ&WRITE_DREAM_STATE to signature|system.
 2014-02-03 15:32:01 -08:00
Craig Mautner
26d61520d8 am 624e98f5: am d5f1fcb7: am 56bf2f67: Merge "Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage" into klp-modular-dev 
* commit '624e98f53962377f00104a50d9fc8e3044cbcd79':
  Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage
 2014-02-03 15:31:57 -08:00
Alan Viverette
6e14cea3e6 am 8b725dcb: Merge "Improve encapsulation of Resources" 
* commit '8b725dcbe15761514eea680c119bcc83a290c0f0':
  Improve encapsulation of Resources
 2014-02-03 15:31:54 -08:00
Chris Wren
edad29aea4 am 5c57c44e: Merge "record the notification style" 
* commit '5c57c44eea02ec579dc24cedfe417d487ba71fce':
  record the notification style
 2014-02-03 15:31:50 -08:00
Chris Craik
32a624cff8 am 494db9e4: Merge "Simplify umbra calculation" 
* commit '494db9e4bbf206025336aee9dfece93639686e44':
  Simplify umbra calculation
 2014-02-03 15:31:47 -08:00
Chris Craik
39d1322cb1 am 1d89563f: Merge "Add initial hidden outline APIs" 
* commit '1d89563ff8f5afd77457ef58489a234f490b480c':
  Add initial hidden outline APIs
 2014-02-03 15:31:44 -08:00
Narayan Kamath
581eb40bc6 am 90b8eaa6: am 797b5adc: am 77a1986c: am 49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible" 
* commit '90b8eaa68bda6beaf2ff886c3ed642e7050e3ff6':
  AArch64: Make AssetManager and related classes 64-bit compatible
 2014-02-03 15:31:40 -08:00
Narayan Kamath
bcc7e5be94 am 8396b56e: am d49babe5: (-s ours) am 9af95574: am 1cadc07d: Merge "Change ResourceType cookies to int32_t." 
* commit '8396b56e0a12d97c7933afca3813c356c18a8f38':
  Change ResourceType cookies to int32_t.
 2014-02-03 15:31:38 -08:00
Narayan Kamath
741fccea18 am fd6a44d0: am ff62e966: am 149510e0: am b9f960e0: Merge "Fixed cancel() not working correctly" 
* commit 'fd6a44d0b5b6bcfc606abf23520b316c4bf36fc4':
  Fixed cancel() not working correctly
 2014-02-03 15:31:35 -08:00
Igor Murashkin
41cc1c253c am 5ec133b9: am ed5d7a6f: am 4463a4ef: am e05b7b50: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" 
* commit '5ec133b9a0949cda92c5c287169aba86ad615065':
  EGL14.eglCreateWindowSurface should set producerControlledByApp
 2014-02-03 15:31:32 -08:00
George Mount
3d215e9f4c am 56f57ccb: Revert "Add Path trimming." 
* commit '56f57ccbd4fbbf4d572cc966d1cb76d7ae7ad334':
  Revert "Add Path trimming."
 2014-02-03 15:31:28 -08:00
Zhijun He
ccd18f1aa6 am 10586ad2: am 4f840dd1: am 5901ddeb: am 0a1b64fe: Merge "Release locked buffer when it fails to acquire graphics buffer" 
* commit '10586ad2a6996b8f9f84ed47a65ccc2d883fc19f':
 2014-02-03 15:31:23 -08:00
Narayan Kamath
0c464c02de am b9fd12ac: am dfd1aa43: resolved conflicts for merge of 2cd0563c to klp-modular-dev-plus-aosp 
* commit 'b9fd12ac53a35800753d54c4c0a825c261267c29':
 2014-02-03 15:31:19 -08:00
Narayan Kamath
0eb9bf638e am 3a5e4705: am 5cdbac1e: (-s ours) am 70986e19: am ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder" 
* commit '3a5e470553a1a42647850b7c642f96961c2e4587':
 2014-02-03 15:31:14 -08:00
Narayan Kamath
6b08b7b33f am 13701e48: am 133c9649: am fa2e16e3: am 54190ec8: Merge "change Surface constructor arg to 64bit" 
* commit '13701e4822d15e67bca1919ea1317312908f0bea':
 2014-02-03 15:31:10 -08:00
Tim Murray
6faecbb8d2 am fd71ddfd: (-s ours) am 6ceac9f0: (-s ours) am f5294ed5: (-s ours) Merge "DO NOT MERGE: Mark new util type functions as @hide in AOSP." 
* commit 'fd71ddfd4378de331e231fbe22beb92f1efcd196':
  DO NOT MERGE: Mark new util type functions as @hide in AOSP.
 2014-02-03 23:20:03 +00:00
Tim Murray
430986178d am 5d331c7c: am b1bec0d9: am 3fb6feac: Merge "Check that bound allocations are 1D" 
* commit '5d331c7c89d2ae7254c06f188cd02f91cd467f45':
  Check that bound allocations are 1D
 2014-02-03 23:19:59 +00:00
Tim Murray
f593000eac am 64788f1b: am 67d9e0be: am 0cc37f4c: Merge "Fix debug context." 
* commit '64788f1b6857c87a14e67044f51c2405195b407c':
  Fix debug context.
 2014-02-03 23:19:54 +00:00