Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
158,082 Commits 3 Branches 0 Tags
cc3ba950ccadac4ff6101cefc42cec19fd93f216
Commit Graph

41164 Commits

Author SHA1 Message Date
Jeff Sharkey
cc3ba950cc am 3de2d914: am 5ec46e9e: am 30a8045d: am 1d98fbf2: Merge "Update API naming to follow style guide." into lmp-dev 
* commit '3de2d9144e7f88a20e62c07999aa94789f4ad2e6':
  Update API naming to follow style guide.
 2014-09-16 21:07:22 +00:00
Chris Craik
29b964db7b am 64d546f2: am 52f7afb1: am 30d4b396: am 447f8cd8: Merge "Enable shadow for GhostView" into lmp-dev 
* commit '64d546f2ec55cd7bc8de47272e80bdb9f5526b1a':
  Enable shadow for GhostView
 2014-09-16 21:07:12 +00:00
Ihab Awad
751b766747 am 5a2462c2: am d03f89c6: am d61d9150: am 336c84c3: Merge "Add system feature for ConnectionService API support (1/3)" into lmp-dev 
* commit '5a2462c2fa163b426e6016804ffc7d40022048b7':
  Add system feature for ConnectionService API support (1/3)
 2014-09-16 21:07:02 +00:00
George Mount
a8c1d0232b am bd0d84df: am c18f3cff: am 6140df56: am 9da2ace7: Merge "Fixed OOM due to visibility transitions." into lmp-dev 
* commit 'bd0d84df3bbda95affdf4cab0e597cc126919883':
  Fixed OOM due to visibility transitions.
 2014-09-16 21:04:02 +00:00
George Mount
71c0f7330b am 8c08a7e5: am 36f24d34: am f7dfba19: am 4bf9a24d: Merge "Fixed enter/exit transitions working against shared elements." into lmp-dev 
* commit '8c08a7e5bd11715b32645d0ff84626a2d9c3273c':
  Fixed enter/exit transitions working against shared elements.
 2014-09-16 21:03:57 +00:00
Eino-Ville Talvala
8e8318fdca am ee577ba4: am e3ca5a2e: am 949fc209: am ac7be719: Merge "Camera2: Clean up corner case error handling" into lmp-dev 
* commit 'ee577ba4dea973f3e527c264f7c817ff7f69e4bf':
  Camera2: Clean up corner case error handling
 2014-09-16 21:03:52 +00:00
Andres Morales
7e8cc9f6b4 am f2feace6: am 5f3c1be8: am f02fab8c: am 1d436165: Merge "Add hidden API for pausing and resuming NFC polling." into lmp-dev 
* commit 'f2feace67ee8f993fe46ef1a742a185fde5c50cc':
  Add hidden API for pausing and resuming NFC polling.
 2014-09-16 21:03:35 +00:00
Wink Saville
9bb67459b6 Merge commit 'edd57a98' into fix-conflict 
* commit 'edd57a98':

Conflicts:
	core/java/android/provider/CallLog.java
	telephony/java/android/telephony/TelephonyManager.java

Change-Id: Ia16537ede73f7b2e2c22ca1ff664a32bd6c272fa
 2014-09-16 13:23:43 -07:00
Jeff Sharkey
2d360218b4 am 1d98fbf2: Merge "Update API naming to follow style guide." into lmp-dev 
* commit '1d98fbf27258cbe98e9f7226cc6baedd83a80d3d':
  Update API naming to follow style guide.
 2014-09-15 22:01:59 +00:00
Chris Craik
aca8b5fd6b am 447f8cd8: Merge "Enable shadow for GhostView" into lmp-dev 
* commit '447f8cd8e5b71119eaee3d6b9b319caeacd9e5cb':
  Enable shadow for GhostView
 2014-09-15 22:01:51 +00:00
Ihab Awad
e11a3b798b am 336c84c3: Merge "Add system feature for ConnectionService API support (1/3)" into lmp-dev 
* commit '336c84c35722e221cb3ec5d99c3876a5e5015e2a':
  Add system feature for ConnectionService API support (1/3)
 2014-09-15 22:01:41 +00:00
Jeff Sharkey
49c0e7375b Merge "Update API naming to follow style guide." into lmp-dev 2014-09-15 21:51:18 +00:00
Chris Craik
7436d1997c Merge "Enable shadow for GhostView" into lmp-dev 2014-09-15 21:32:06 +00:00
Jeff Sharkey
de74231f24 Update API naming to follow style guide. 
Bug: 17510755
Change-Id: If73d81b416355559592feb895a62132194f4ba62
 2014-09-15 14:17:46 -07:00
Ihab Awad
de4e52aa49 Merge "Add system feature for ConnectionService API support (1/3)" into lmp-dev 2014-09-15 20:14:51 +00:00
Wink Saville
02e3979d62 Merge commit 'e58e59cc' into fix-merge-conflict 
* commit 'e58e59cc':
  ksd to lmp-sprout-dev

Conflicts:
	core/java/android/provider/CallLog.java
	telephony/java/android/telephony/SubInfoRecord.java
	telephony/java/android/telephony/SubscriptionManager.java
	telephony/java/android/telephony/TelephonyManager.java
	telephony/java/com/android/internal/telephony/ISub.aidl
	telephony/java/com/android/internal/telephony/TelephonyIntents.java

Change-Id: I2b892b692743a7ccde55185a2b90135bf28408cd
 2014-09-15 12:40:02 -07:00
George Mount
2511bf3e42 am 9da2ace7: Merge "Fixed OOM due to visibility transitions." into lmp-dev 
* commit '9da2ace7b05124d4709846e714f6abf9f78c9b04':
  Fixed OOM due to visibility transitions.
 2014-09-15 19:28:33 +00:00
George Mount
fc64541f51 am 4bf9a24d: Merge "Fixed enter/exit transitions working against shared elements." into lmp-dev 
* commit '4bf9a24d6bbe3a95cf1f1740a6df931c282d5adc':
  Fixed enter/exit transitions working against shared elements.
 2014-09-15 19:28:29 +00:00
Eino-Ville Talvala
2396727e99 am ac7be719: Merge "Camera2: Clean up corner case error handling" into lmp-dev 
* commit 'ac7be7192127be81b7cc0737c86c04a1f6aba851':
  Camera2: Clean up corner case error handling
 2014-09-15 19:28:25 +00:00
Andres Morales
d5e212ae7f am 1d436165: Merge "Add hidden API for pausing and resuming NFC polling." into lmp-dev 
* commit '1d4361657a3478c77d6a71c248a007d04f8106e6':
  Add hidden API for pausing and resuming NFC polling.
 2014-09-15 19:28:05 +00:00
George Mount
08ff5c14fe Merge "Fixed OOM due to visibility transitions." into lmp-dev 2014-09-15 18:12:24 +00:00
George Mount
94e7e7ef91 Merge "Fixed enter/exit transitions working against shared elements." into lmp-dev 2014-09-15 18:12:13 +00:00
Eino-Ville Talvala
5fa15be4e9 Merge "Camera2: Clean up corner case error handling" into lmp-dev 2014-09-15 18:11:11 +00:00
George Mount
27bc8aa583 Fixed enter/exit transitions working against shared elements. 
Bug 17499971

The enter and exit transitions were targeting the shared element.
This means you'd get double transitions on the shared element.

Also, the enter transition was not properly initialized to have
an invalid target so it was targeting all views.

Change-Id: I4f3510c70bea90f09be01776bc0ad1ffb42d99d5
 2014-09-15 11:08:39 -07:00
George Mount
79b2781aa7 Fixed OOM due to visibility transitions. 
Have maximum size for Visibility transition bitmaps.

Also changed Visibility to avoid transitioning out child views
while transitioning out their parents.

Also moved view-to-bitmap code to common utility.

Bug 17469198

Change-Id: I05f069a267539b479da1b39cdad2cc9270c5c381
 2014-09-15 11:05:36 -07:00
Ihab Awad
1ec6888685 Add system feature for ConnectionService API support (1/3) 
Bug: 17445268
Change-Id: Ibf52cb394f00d075afd07b883a91f00da84b3c85
 2014-09-15 09:10:54 -07:00
Andres Morales
bd9d664743 Merge "Add hidden API for pausing and resuming NFC polling." into lmp-dev 2014-09-15 15:10:45 +00:00
George Mount
48520a6c5a am e0b9e2f1: am 7d3d95e7: Merge "Fix exit transitions hiding views permanently." into lmp-dev 
* commit 'e0b9e2f107660e09daa5c0a5ecc1a616cd7da097':
  Fix exit transitions hiding views permanently.
 2014-09-15 14:43:29 +00:00
George Mount
8c598767a7 am 7d3d95e7: Merge "Fix exit transitions hiding views permanently." into lmp-dev 
* commit '7d3d95e790c475c81da9be60d3355637ac5b4332':
  Fix exit transitions hiding views permanently.
 2014-09-15 14:22:36 +00:00
George Mount
2911b2046a Merge "Fix exit transitions hiding views permanently." into lmp-dev 2014-09-15 14:06:52 +00:00
Alan Viverette
14d639755e am 62b910c0: am 6ef642ca: Merge "Clean up view drawable tinting methods, fix default modes" into lmp-dev 
* commit '62b910c008da3fbcf11f67340002aa14e1d297b0':
  Clean up view drawable tinting methods, fix default modes
 2014-09-15 00:00:37 +00:00
Alan Viverette
4603667604 am 6ef642ca: Merge "Clean up view drawable tinting methods, fix default modes" into lmp-dev 
* commit '6ef642ca26e777c13c9a48665ed29e37e599736b':
  Clean up view drawable tinting methods, fix default modes
 2014-09-14 23:44:34 +00:00
Chris Craik
203d1cce5c Enable shadow for GhostView 
bug:17331776
Change-Id: Ia5819422e8cb53d2a4da110f819823b4e90e2fee
 2014-09-14 16:28:52 -07:00
Alan Viverette
b56f5d2ab1 Clean up view drawable tinting methods, fix default modes 
Calling setTint now only modifies the tint. It won't force a mode change.

BUG: 17494736
Change-Id: I91392634869ed23981d8e61a403bb2be42aa7a07
 2014-09-14 15:48:50 -07:00
Eino-Ville Talvala
9503785393 Camera2: Clean up corner case error handling 
- If a session is closed, and a new session is created immediately
afterwards, but then fails to be configured, the first session sees an
onUnconfigured call which it wasn't expecting, and throws an
exception on an internal thread, leading to app death.
Add a guard against this case.

- If the lower levels skip a frame (illegal per design), be slightly more
robust to that by accepting any successful result as the latest completed
frame, instead of just incrementing the completed frame count. This will
lead to missing results, but should allow shutdown, etc, to complete
cleanly.

- Convert TIMED_OUT error codes to CAMERA_ERROR CameraAccessExceptions.
This is a common error code returned by waitUntilIdle.

Also, improve debug logging to log a session ID with verbose logging,
and add a few verbose logs.

Bug: 16899526
Change-Id: I7a31f0a12effc2611e1f9c2408224ee82c37c912
 2014-09-14 14:41:47 -07:00
Alan Viverette
56c4f5c139 am 84670eef: Merge "Reduce instructions required to obtain and recycle TypedArray" into lmp-dev 
* commit '84670eef1f2d685efc98644914d2bb191d0e665c':
  Reduce instructions required to obtain and recycle TypedArray
 2014-09-14 21:04:59 +00:00
John Spurlock
07d245ba89 am 1ddb7a6b: Merge "Saver: PowerManager call to set low power mode." into lmp-dev 
* commit '1ddb7a6b406f23c3b549aa6a771cec61c1778f3e':
  Saver: PowerManager call to set low power mode.
 2014-09-14 21:04:50 +00:00
Alan Viverette
4a7ac30043 am d2f58ac3: am 84670eef: Merge "Reduce instructions required to obtain and recycle TypedArray" into lmp-dev 
* commit 'd2f58ac3e3e0b49f33b98bd9f99f7658fd18b9a6':
  Reduce instructions required to obtain and recycle TypedArray
 2014-09-14 20:21:46 +00:00
John Spurlock
b9e2fe1d4a am 1c1683a3: am 1ddb7a6b: Merge "Saver: PowerManager call to set low power mode." into lmp-dev 
* commit '1c1683a35a0267c03729fa36b930c3dc803aff7a':
  Saver: PowerManager call to set low power mode.
 2014-09-14 20:09:39 +00:00
Alan Viverette
c6a65dfbff Merge "Reduce instructions required to obtain and recycle TypedArray" into lmp-dev 2014-09-14 20:04:38 +00:00
John Spurlock
8d4e6cb060 Saver: PowerManager call to set low power mode. 
- Add an explicit power manager call to set the low power mode state,
  instead of trying manage everything around a single setting.
- When low-power mode is triggered by falling below the configured
  threshold, it does not update the setting.
- The "is-enabled" api returns setting || below configured trigger.
- Move the snooze management into the new api call.
- Callers (sysui + settings) updated to use the api instead of the
  setting.
- Handles the case where the level does an unpowered leap out of the
  low battery level. (Possible if powered in-between while the device
  is off)

Bug:17460535
Change-Id: Ic030504c9cad9868a7137abbe837b170da37852b
 2014-09-14 14:07:23 -04:00
Alan Viverette
8b5b25b448 Reduce instructions required to obtain and recycle TypedArray 
Eliminates several field and method accesses by making the TypedArray
pool local to a single Resources object. Removes an unnecessary
synchronization.

ReadXmlAttrs averaged 0.069 ms/op before, 0.064 ms/op after.

BUG: 17484798
Change-Id: If790a5ba6596b47a04f117c8912974798a592052
 2014-09-13 19:30:11 -07:00
Tyler Gunn
6c8d6d74c0 resolved conflicts for merge of 66c16547 to lmp-sprout-dev 
Also fixed issue in TelephonyManager.

Change-Id: I4dde45e638c2bcf32f8f929d34d0083966f6761f
 2014-09-13 20:10:08 +00:00
Tyler Gunn
8bc3996189 am 21282583: am 66c16547: Merge "Renaming Telecomm to Telecom." into lmp-dev 
* commit '2128258322aa2f90d65c1963ede79d1bffb3fce4':
  Renaming Telecomm to Telecom.
 2014-09-13 18:03:04 +00:00
Tyler Gunn
ef9f6f957d Renaming Telecomm to Telecom. 
- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.

Bug: 17364651
Change-Id: I192cb5d189f55db012ea72ee82ccc5aedbc21638
 2014-09-12 22:16:17 -07:00
Jeff Brown
8c3b757948 am 18f9b97a: am ce0a756f: Merge "Add support for dozing after screen off." into lmp-dev 
* commit '18f9b97ac486e93ca62e2d30a5eb29b2b3763add':
  Add support for dozing after screen off.
 2014-09-13 03:13:07 +00:00
Adam Powell
f1be67f3ea am 8e8d8655: am dd9488c1: Merge "Provide a public API for View#computeFitSystemWindows" into lmp-dev 
* commit '8e8d86559e4938daed3bb018afb61336e643e2e3':
  Provide a public API for View#computeFitSystemWindows
 2014-09-13 02:37:35 +00:00
Eric Laurent
3eb236cca0 am 8d002c9e: am a7f44594: Merge "SoundTrigger: fix KeyphraseRecognitionEvent parceling" into lmp-dev 
* commit '8d002c9e1069577bd624889229d9047611aca0d2':
  SoundTrigger: fix KeyphraseRecognitionEvent parceling
 2014-09-13 02:37:30 +00:00
Paul Jensen
ae0477be09 am 11ee98ad: am 28b89f98: Allow libcore to perform necessary actions upon net config changes. 
* commit '11ee98ade47dddefa60cf3f54a3a4c82a5d5f7ee':
  Allow libcore to perform necessary actions upon net config changes.
 2014-09-13 02:36:05 +00:00
Amith Yamasani
6248ea5852 am 67e56d47: am 13c4e5ad: Merge "Rename and repurpose feature MANAGED_PROFILES to MANAGED_USERS" into lmp-dev 
* commit '67e56d47d8416c73973c92557abefa7aa3975f7c':
  Rename and repurpose feature MANAGED_PROFILES to MANAGED_USERS
 2014-09-13 02:35:59 +00:00