Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
125,153 Commits 3 Branches 0 Tags
5c2fa68e7afbecb197bdfa3d7e615d645ea856e1
Commit Graph

33965 Commits

Author SHA1 Message Date
Dianne Hackborn
5c2fa68e7a am d39ccd0a: Merge "Start tracking radio up time." 
* commit 'd39ccd0ad9cb562b0093eaf78a5273b000c0aa7a':
  Start tracking radio up time.
 2014-02-13 09:58:44 -08:00
Dianne Hackborn
d39ccd0ad9 Merge "Start tracking radio up time." 2014-02-13 17:56:12 +00:00
Dianne Hackborn
e13c4c0b66 Start tracking radio up time. 
We now always turn on network state tracking for mobile,
and push this information down to battery stats.

In battery stats we use this to both log the changes in
the history and keep track of the total time the mobile
radio was active.

Power computation is switched over to using this information
to help determine power use, which will hopefully make it
more accurate (not counting inaccuracies in knowing when it
actually goes down).

Note yet done is aggregating this data per-uid, to better
emphasize which apps are causing the radio to be up.  Right
now we just spread the total time across all uids weighted
by the total number of packets they have sent and received.

Also put in the battery stats infrastructure for bluetooth to
address issue #12973036: Improve power_profile.xml

Change-Id: I39d11b7ff6ae4f336f253d1cba308d8569de7e0d
 2014-02-13 17:55:40 +00:00
ztenghui
d4d87466c4 am b67ca78d: Merge "Fix one flag setting bug" 
* commit 'b67ca78d97f775cfd5b37e9a63fc708fd2897d01':
  Fix one flag setting bug
 2014-02-12 16:18:23 -08:00
ztenghui
b67ca78d97 Merge "Fix one flag setting bug" 2014-02-13 00:16:37 +00:00
Alan Viverette
2a7fc2bf15 am 71c6ca2a: Merge "Update smoothScrollToPosition to move faster for large offsets" 
* commit '71c6ca2a752d9b722a9774a881f8e539a24ea862':
  Update smoothScrollToPosition to move faster for large offsets
 2014-02-12 15:55:03 -08:00
Alan Viverette
aa32af1c4f am 5aa944d9: Merge "Fix RelativeLayout measurement" 
* commit '5aa944d9985344ac3be113eee3874be920bf12d2':
  Fix RelativeLayout measurement
 2014-02-12 15:55:00 -08:00
Alan Viverette
71c6ca2a75 Merge "Update smoothScrollToPosition to move faster for large offsets" 2014-02-12 23:51:56 +00:00
Alan Viverette
5aa944d998 Merge "Fix RelativeLayout measurement" 2014-02-12 23:51:11 +00:00
Alan Viverette
d5694f02d5 Fix RelativeLayout measurement 
BUG: 12993953
Change-Id: Idf82734eb9a06ea7610e8eb42705da9f4a4639e9
 2014-02-12 15:49:18 -08:00
Paul Duffin
a8a0d5721f am 5ea06c59: am 4de91118: am 0741e11c: am 75d67c6a: am d562a9b5: Merge "Improve Parcel\'s handling of non-primitive arrays" 
* commit '5ea06c59be1f7a0495378f703562ee02eaad99d8':
  Improve Parcel's handling of non-primitive arrays
 2014-02-12 15:07:23 -08:00
Paul Duffin
5ea06c59be am 4de91118: am 0741e11c: am 75d67c6a: am d562a9b5: Merge "Improve Parcel\'s handling of non-primitive arrays" 
* commit '4de9111819638b70dd6fb58094d7a61477fc59da':
  Improve Parcel's handling of non-primitive arrays
 2014-02-12 23:01:39 +00:00
Nick Kralevich
5ffa27fecd am d5c8044e: resolved conflicts for merge of 1cbea39f to master 
* commit 'd5c8044e7e1f1402fdd4a035690329294ab07b33':
  Runtime resource overlay, iteration 2
 2014-02-12 14:49:49 -08:00
Nick Kralevich
d5c8044e7e resolved conflicts for merge of 1cbea39f to master 
Change-Id: Ib33484546c6a03cbc4cd96e97d9d785d68e10700
 2014-02-12 14:41:25 -08:00
ztenghui
b9122c672e Fix one flag setting bug 
TODO: encapsulate the bit operations into functions.

Change-Id: I68ada214c080ac54ea43c327684c87dacef85491
 2014-02-12 14:32:59 -08:00
Chris Craik
166d89ae03 am c70c723c: Merge "Avoid crash if layer is destroyed after GLRenderer" 
* commit 'c70c723cf8a892fb4be2f5917e596d79dfb3cb91':
  Avoid crash if layer is destroyed after GLRenderer
 2014-02-12 13:56:22 -08:00
Chris Craik
c70c723cf8 Merge "Avoid crash if layer is destroyed after GLRenderer" 2014-02-12 21:52:42 +00:00
Chris Craik
637314d15c Avoid crash if layer is destroyed after GLRenderer 
bug:12988766
Change-Id: I96961aeef0b1d42ae8c609f1607a100e61a3d593
 2014-02-12 13:45:52 -08:00
Alan Viverette
441b437b72 Update smoothScrollToPosition to move faster for large offsets 
Adds a method to AbsListView for translating from position to row
and vice-versa. Doesn't NPE this time.

BUG: 3434554
Change-Id: I6a731aedda6d951ad46322dbe87df00b8d34a22c
 2014-02-12 13:30:20 -08:00
Alan Viverette
1e9357fbbd am 09591e89: Merge "Add support for assigning keyed View tags via XML" 
* commit '09591e89e4cf6d3ea836b02e3ef965375f4ab214':
  Add support for assigning keyed View tags via XML
 2014-02-12 12:48:57 -08:00
Alan Viverette
09591e89e4 Merge "Add support for assigning keyed View tags via XML" 2014-02-12 20:46:38 +00:00
Alan Viverette
c8375f45b1 am f556adf4: Merge "Set properties for pooled CollectionItemInfo, CollectionInfo" 
* commit 'f556adf45e7fd925259b5c6bc87d23f0400a51c1':
  Set properties for pooled CollectionItemInfo, CollectionInfo
 2014-02-12 12:28:52 -08:00
Alan Viverette
f556adf45e Merge "Set properties for pooled CollectionItemInfo, CollectionInfo" 2014-02-12 20:26:55 +00:00
Alan Viverette
cdd2eddcb2 Set properties for pooled CollectionItemInfo, CollectionInfo 
BUG: 12978446
Change-Id: I64a366952090ab663ffef43a1d210528805e113c
 2014-02-12 11:28:33 -08:00
Paul Duffin
0741e11c65 am 75d67c6a: am d562a9b5: Merge "Improve Parcel\'s handling of non-primitive arrays" 
* commit '75d67c6aa051392e711fde3b901a4f2c62f983db':
  Improve Parcel's handling of non-primitive arrays
 2014-02-12 19:23:01 +00:00
John Spurlock
af9d20d782 am a447947e: Merge "Improve error handling in listener services." 
* commit 'a447947e2ea9fc5ad4e3651a38de6fadb89afbd8':
  Improve error handling in listener services.
 2014-02-12 11:22:36 -08:00
John Spurlock
a447947e2e Merge "Improve error handling in listener services." 2014-02-12 19:20:21 +00:00
Nick Kralevich
dd3d95f182 resolved conflicts for merge of 4ad93639 to klp-modular-dev-plus-aosp 
Change-Id: I7ad222301ec0b863d48a1a9a839469436c385ea0
 2014-02-12 11:05:59 -08:00
Derek Sollenberger
c248461ac9 am ebcf70b1: Merge "Revert "Refactor setting an SkPaint onto a hwui Layer."" 
* commit 'ebcf70b128f209ed74f781f82fe3fa11c017246f':
  Revert "Refactor setting an SkPaint onto a hwui Layer."
 2014-02-12 11:04:26 -08:00
Derek Sollenberger
ebcf70b128 Merge "Revert "Refactor setting an SkPaint onto a hwui Layer."" 2014-02-12 19:00:46 +00:00
Derek Sollenberger
90d0c75e94 Revert "Refactor setting an SkPaint onto a hwui Layer." 
This reverts commit e889298cd6.

Change-Id: I4b1d609b2d4280595d40cb10d6c18875c22999f8
 2014-02-12 18:59:05 +00:00
Derek Sollenberger
efdf735e94 am 5f97e9e9: Merge "Refactor setting an SkPaint onto a hwui Layer." 
* commit '5f97e9e9ed2a6da22a6ed90b8db11052dd6a8cd7':
  Refactor setting an SkPaint onto a hwui Layer.
 2014-02-12 10:13:10 -08:00
Derek Sollenberger
5f97e9e9ed Merge "Refactor setting an SkPaint onto a hwui Layer." 2014-02-12 18:10:21 +00:00
John Spurlock
da9a3bed8e Improve error handling in listener services. 
Check explicitly for null listeners in NMS, throwing
IllegalArgumentException (on the small list of exceptions
that survive RPC boundaries) with a message.

Normally this situation is caused by listeners that attempt to
perform NM-related actions before they are bound.  Check for
this case in the base NLS class and avoid the call to NM if we
know it will fail.

Although it's tempting to throw an IllegalStateException on the
client side, preserve the existing semantics for backwards-compatibility
purposes.  That is, silently fail (or return null) - and provide a
log warning.

Bug:12805707
Change-Id: I0d92fd0d460a8592e8a23fd8fd718ae2ba3bd4c7
 2014-02-12 12:35:10 -05:00
Derek Sollenberger
e889298cd6 Refactor setting an SkPaint onto a hwui Layer. 
This CL removes the unecessary JNI call to set the colorFilter on
a layer.

Change-Id: I9e088f888938d4315745aa618334bfdb9e61343a
 2014-02-12 11:26:06 -05:00
Paul Duffin
d562a9b516 Merge "Improve Parcel's handling of non-primitive arrays" 2014-02-12 10:27:14 +00:00
Sailesh Nepal
1bd7876d76 Add Wi-Fi calling state setting to telephony interfaces 
Change-Id: I01029ade0eb1ff981cb92a536d042a02129a053f
 2014-02-11 22:32:21 -08:00
Alan Viverette
451a3417e9 Add support for assigning keyed View tags via XML 
BUG: 12768823
Change-Id: Ic55c88894dc153c0af0805e403ad8e40d13abcd2
 2014-02-11 18:08:46 -08:00
Jeff Brown
be83e4a08e am 38f96e50: Add support for injecting events into ActivityContainers. (DO NOT MERGE) 
* commit '38f96e5020b3e82b98fe97b0be363a5ad185860f':
  Add support for injecting events into ActivityContainers. (DO NOT MERGE)
 2014-02-12 00:37:24 +00:00
Jeff Brown
ca9bc702df Add support for injecting events into ActivityContainers. 
Modified ActivityView to inject touch events it receives back into
its activity container.  The container then injects the event into
the input system along with the display id of the underlying virtual
display.

Change-Id: I23d018a2f7dd30f1f833f522eb7f143b43d8e637
 2014-02-11 14:47:48 -08:00
Jeff Brown
38f96e5020 Add support for injecting events into ActivityContainers. (DO NOT MERGE) 
Modified ActivityView to inject touch events it receives back into
its activity container.  The container then injects the event into
the input system along with the display id of the underlying virtual
display.

Enhanced the input system to support concurrent dispatch of touch
events on multiple displays which is required for this to work.

Change-Id: I9cf1870db3be6f99a52ed9a1e3ceafe42c940093
 2014-02-11 14:43:04 -08:00
Griff Hazen
6adfd86ca9 am 4e795ebe: am 0ff811db: Merge "Add local-only option to Notification (using flag)" into klp-modular-dev 
* commit '4e795ebe1783623a28a988f77b4f0f11d54e73be':
  Add local-only option to Notification (using flag)
 2014-02-11 21:40:48 +00:00
Griff Hazen
4e795ebe17 am 0ff811db: Merge "Add local-only option to Notification (using flag)" into klp-modular-dev 
* commit '0ff811db58089e7b4e8fbca4f41be8f20c86ce10':
  Add local-only option to Notification (using flag)
 2014-02-11 21:34:53 +00:00
Dianne Hackborn
67754d93c4 Merge "Runtime resource overlay, iteration 2" 2014-02-11 21:29:58 +00:00
Griff Hazen
dfcb0803bf Add local-only option to Notification (using flag) 
Change-Id: Ic6d2f3b0cf06b58c0afa2af0fa6b245124424223
 2014-02-11 12:00:00 -08:00
Kenny Guy
826e51c4da Merge "Add concepts of related users and managed profiles to user manager." 2014-02-11 19:27:36 +00:00
John Reck
9b6fa77518 Merge "Implement missing safelyRun() on ThreadedRenderer" 2014-02-11 18:55:46 +00:00
John Reck
fc53ef2779 Implement missing safelyRun() on ThreadedRenderer 
Change-Id: I14b75f37a13fabaa759a51369190dbdc84087c4b
 2014-02-11 10:40:25 -08:00
Eino-Ville Talvala
3b1da03c8b Merge "camera2: Clean up cross-references" 2014-02-11 17:57:08 +00:00
John Reck
f6eebb21d5 Merge "Refactor HardwareLayer" 2014-02-11 17:30:53 +00:00