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

148906 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
6c7ec13836 am 8131a5dd: am 1a0066b6: am d9f038c1: Merge "Make TrafficStats uid attribution @SystemApi" into lmp-dev 
* commit '8131a5dd42e441420cf99b99e152ee1510feabf2':
  Make TrafficStats uid attribution @SystemApi
 2014-08-08 02:22:23 +00:00
Christopher Tate
931535cbc7 am 3755910a: am 9d24d44e: am f671005b: Introduce system API for distinguishing the owner user 
* commit '3755910ad680f88d3eb5d3db78a2fd5e9b36cebb':
  Introduce system API for distinguishing the owner user
 2014-08-08 02:22:16 +00:00
Dianne Hackborn
bd0e0e2ed6 am 23a2f922: am f1de7d98: am c8c42a7c: Merge "Fix to call VoiceInteractionSession.onDestroy()." into lmp-dev 
* commit '23a2f922fadade5a29ff93a2c304b6c89eeaa84f':
  Fix to call VoiceInteractionSession.onDestroy().
 2014-08-08 02:22:11 +00:00
Behdad Esfahbod
ce97d6df5c am e7433ed8: am 037eb8eb: am 7dc6dcd4: Merge "Remove dependency on SkPaintOptionsAndroid" into lmp-dev 
* commit 'e7433ed88cb2ce7d103824e726ec93f6b8dbf75d':
  Remove dependency on SkPaintOptionsAndroid
 2014-08-08 02:22:05 +00:00
Dianne Hackborn
5a6aaf7bcf am d9b3fab2: am d741140f: am e46717b6: Fix issue @16555033: Battery history overflowing too much 
* commit 'd9b3fab2bdd9c0c42807d03e8b133deb7337bfb3':
  Fix issue @16555033: Battery history overflowing too much
 2014-08-08 02:21:57 +00:00
Sandeep Siddhartha
7d5e5c7901 am ba40dca5: am d54fa323: am f52031b2: Dump the state of SoundTriggerHelper for bugreports 
* commit 'ba40dca5260f0f3fe20f51c503e545b7ee5c6df0':
  Dump the state of SoundTriggerHelper for bugreports
 2014-08-08 02:21:53 +00:00
Sandeep Siddhartha
140dd87333 am 22a3c9e6: am 9ac2891f: am 53f4a335: Merge "Handle microphone contention/Phone calls while recognition is active" into lmp-dev 
* commit '22a3c9e6d899197f772837dabb810a539d3782ac':
  Handle microphone contention/Phone calls while recognition is active
 2014-08-08 02:21:46 +00:00
Santos Cordon
64a2ad1a36 am 92d07514: am febe4691: am b24368ea: Remove ldaps from AOSP code. 
* commit '92d07514f90d769cf6b6c6bf27b3c6474691c1cd':
  Remove ldaps from AOSP code.
 2014-08-08 02:21:39 +00:00
Sandeep Siddhartha
a8054cfe3c am 73d5dc67: am 969edb82: am 5885981a: Merge "Fix build break" into lmp-dev 
* commit '73d5dc67665778a5cf01dc0cb0d586e57834c991':
  Fix build break
 2014-08-08 02:21:29 +00:00
Christopher Tate
472eceb23d am 1a0066b6: am d9f038c1: Merge "Make TrafficStats uid attribution @SystemApi" into lmp-dev 
* commit '1a0066b6ad98b0bcedd871e2b6543f28fa88e066':
  Make TrafficStats uid attribution @SystemApi
 2014-08-08 00:54:28 +00:00
Christopher Tate
2556096532 am 9d24d44e: am f671005b: Introduce system API for distinguishing the owner user 
* commit '9d24d44ed9f52f274d35b4087003af0b495c4979':
  Introduce system API for distinguishing the owner user
 2014-08-08 00:54:25 +00:00
Dianne Hackborn
009bf3e865 am f1de7d98: am c8c42a7c: Merge "Fix to call VoiceInteractionSession.onDestroy()." into lmp-dev 
* commit 'f1de7d9868cce90b67d57731a0ebabdb542807b2':
  Fix to call VoiceInteractionSession.onDestroy().
 2014-08-08 00:54:17 +00:00
Behdad Esfahbod
c703ade25c am 037eb8eb: am 7dc6dcd4: Merge "Remove dependency on SkPaintOptionsAndroid" into lmp-dev 
* commit '037eb8ebe6298effbe93f6681aaa94a474acac31':
  Remove dependency on SkPaintOptionsAndroid
 2014-08-08 00:54:10 +00:00
Dianne Hackborn
67cc9239f9 am d741140f: am e46717b6: Fix issue @16555033: Battery history overflowing too much 
* commit 'd741140fc57c2f9356067fb9f8fc5562cd74bbee':
  Fix issue @16555033: Battery history overflowing too much
 2014-08-08 00:54:03 +00:00
Sandeep Siddhartha
5d4340e2f1 am d54fa323: am f52031b2: Dump the state of SoundTriggerHelper for bugreports 
* commit 'd54fa323e8fa443e4b7f14a0426c678c24ccda04':
  Dump the state of SoundTriggerHelper for bugreports
 2014-08-08 00:53:58 +00:00
Sandeep Siddhartha
d983258136 am 9ac2891f: am 53f4a335: Merge "Handle microphone contention/Phone calls while recognition is active" into lmp-dev 
* commit '9ac2891f9ece67b93fae0277434340c604bc391d':
  Handle microphone contention/Phone calls while recognition is active
 2014-08-08 00:53:53 +00:00
Santos Cordon
43983b878a am febe4691: am b24368ea: Remove ldaps from AOSP code. 
* commit 'febe469129ecda5daa63ff55b9ce259b0f88ced4':
  Remove ldaps from AOSP code.
 2014-08-08 00:53:36 +00:00
Sandeep Siddhartha
38bbb59676 am 969edb82: am 5885981a: Merge "Fix build break" into lmp-dev 
* commit '969edb82edfafbf49792ca9e383c99697329ab27':
  Fix build break
 2014-08-08 00:53:23 +00:00
Christopher Tate
6a3a2d5a90 am d9f038c1: Merge "Make TrafficStats uid attribution @SystemApi" into lmp-dev 
* commit 'd9f038c1dc29d7a73c1888b83b7e7c1f643ffa0c':
  Make TrafficStats uid attribution @SystemApi
 2014-08-07 19:48:40 +00:00
Christopher Tate
deec962ece am f671005b: Introduce system API for distinguishing the owner user 
* commit 'f671005b75b3d603fb664afb64576c7c59cb5387':
  Introduce system API for distinguishing the owner user
 2014-08-07 19:48:36 +00:00
Dianne Hackborn
151c4eb4d3 am c8c42a7c: Merge "Fix to call VoiceInteractionSession.onDestroy()." into lmp-dev 
* commit 'c8c42a7cab25d1d7e5c774dfaa9241131cb4eb15':
  Fix to call VoiceInteractionSession.onDestroy().
 2014-08-07 19:44:26 +00:00
Christopher Tate
cbd7a6ecbb Introduce system API for distinguishing the owner user 
Support services that special case the owner but are instantiated
per-user, and so need to be able to distinguish.

Bug 16661321

Change-Id: I7ff5168c91e39821317fdf5cfaba34e90d30de95
 2014-08-07 19:43:17 +00:00
Behdad Esfahbod
ab42b32fb9 am 7dc6dcd4: Merge "Remove dependency on SkPaintOptionsAndroid" into lmp-dev 
* commit '7dc6dcd417c23159047082a891288775b9e778b2':
  Remove dependency on SkPaintOptionsAndroid
 2014-08-07 19:36:43 +00:00
Dianne Hackborn
7adcb6defe am e46717b6: Fix issue @16555033: Battery history overflowing too much 
* commit 'e46717b661b685cc1586a59f00cd6cf10822896b':
  Fix issue @16555033: Battery history overflowing too much
 2014-08-07 19:24:12 +00:00
Dianne Hackborn
0068d3dcf1 Fix issue @16555033: Battery history overflowing too much 
- No longer track process starts/stops normally.
- Increase buffer size to 256KB.
- Buffer size increase requires reworking how battery stats
  are retrieved, since it is going to be hitting IPC limits.
- Also, store the last full stats after a reset, to be reported
  at the next checkin.
- Also, discharge and charge times are tagged with the screen
  and battery save state during that time.

Change-Id: Ie108ac9b626846108a9bb858101ac2b93276ac16
 2014-08-07 12:19:39 -07:00
Sandeep Siddhartha
374b13dc23 am f52031b2: Dump the state of SoundTriggerHelper for bugreports 
* commit 'f52031b22e8979cb54b840f8bec3346fb53ec561':
  Dump the state of SoundTriggerHelper for bugreports
 2014-08-07 19:17:52 +00:00
Winson Chung
38c010dd05 am 06e564d2: am e70eb503: am f9c1251b: Merge "Initial changes to add task affiliation styling. (Bug 16656169)" into lmp-dev 
* commit '06e564d23309dc1c5198eda98e975b7fc5f00c61':
  Initial changes to add task affiliation styling.  (Bug 16656169)
 2014-08-07 19:17:19 +00:00
Glenn Kasten
b8ade1e976 am 7bffa188: am fc752425: am cd55d2e5: Merge "Add setting to disable automatic USB audio routing" into lmp-dev 
* commit '7bffa188c6cfc180b0efea2e7d00b73088acb875':
  Add setting to disable automatic USB audio routing
 2014-08-07 19:17:14 +00:00
Sandeep Siddhartha
0cb13caff6 am b8086b66: am 7e0e4515: am e931a72d: Handle same keyphrase for multiple users 
* commit 'b8086b6676fc9e086d2128c028a8223a2618affa':
  Handle same keyphrase for multiple users
 2014-08-07 19:17:09 +00:00
Sandeep Siddhartha
4f5e1baa11 am 2c28164d: am 84e8121f: am b6c0b037: Merge "Read audio format from the recognition event" into lmp-dev 
* commit '2c28164df8c56ff26b4b0f045d40fb756697b44d':
  Read audio format from the recognition event
 2014-08-07 19:17:05 +00:00
Adam Powell
0ee1e2436e am a653ca15: am 0ae66be2: am 157fab0c: Nested pre-fling for AbsListView and ScrollView 
* commit 'a653ca1573f13a496d2fe163f2c1d58523a8fa41':
  Nested pre-fling for AbsListView and ScrollView
 2014-08-07 19:17:00 +00:00
Sandeep Siddhartha
e496b54dfe am 53f4a335: Merge "Handle microphone contention/Phone calls while recognition is active" into lmp-dev 
* commit '53f4a3359cc21ef20844759c2788c4b9d1a0cc73':
  Handle microphone contention/Phone calls while recognition is active
 2014-08-07 19:13:46 +00:00
Sandeep Siddhartha
6b8556d2e3 Dump the state of SoundTriggerHelper for bugreports 
Change-Id: I01a17d969fbd22c6bcbb161e3542ca14a3f8c7c8
 2014-08-07 12:10:48 -07:00
Winson Chung
c51d50c4db am e70eb503: am f9c1251b: Merge "Initial changes to add task affiliation styling. (Bug 16656169)" into lmp-dev 
* commit 'e70eb503d1798fe391eae9c84050092e510234fc':
  Initial changes to add task affiliation styling.  (Bug 16656169)
 2014-08-07 19:07:42 +00:00
Glenn Kasten
4552829ae0 am fc752425: am cd55d2e5: Merge "Add setting to disable automatic USB audio routing" into lmp-dev 
* commit 'fc7524257aedf685908528c778843294d4e07da1':
  Add setting to disable automatic USB audio routing
 2014-08-07 19:07:37 +00:00
Sandeep Siddhartha
4d72ebe642 am 7e0e4515: am e931a72d: Handle same keyphrase for multiple users 
* commit '7e0e4515db07858254c04a2a347b4758689d4615':
  Handle same keyphrase for multiple users
 2014-08-07 19:07:32 +00:00
Sandeep Siddhartha
6c10af5c2c am 84e8121f: am b6c0b037: Merge "Read audio format from the recognition event" into lmp-dev 
* commit '84e8121f7bc0b5981052462800e5e35b18876d87':
  Read audio format from the recognition event
 2014-08-07 19:07:27 +00:00
Adam Powell
e5d01bf717 am 0ae66be2: am 157fab0c: Nested pre-fling for AbsListView and ScrollView 
* commit '0ae66be2d2e78be5f3b21f1592ee421c10ac5ca3':
  Nested pre-fling for AbsListView and ScrollView
 2014-08-07 19:07:02 +00:00
Dianne Hackborn
df192a47fc Merge "Fix to call VoiceInteractionSession.onDestroy()." into lmp-dev 2014-08-07 18:53:12 +00:00
Dianne Hackborn
9a35d78cad Fix to call VoiceInteractionSession.onDestroy(). 
Change-Id: I2b4f19538700c691dac3a83aadfa0959ef1fe458
 2014-08-07 12:34:37 -07:00
Behdad Esfahbod
ec2332121b Merge "Remove dependency on SkPaintOptionsAndroid" into lmp-dev 2014-08-07 18:49:59 +00:00
Santos Cordon
2bfcc7a05c am b24368ea: Remove ldaps from AOSP code. 
* commit 'b24368eabc7def55a534f9cb9bb78c346a3ec3fd':
  Remove ldaps from AOSP code.
 2014-08-07 18:44:13 +00:00
Derek Sollenberger
6f03023ece Remove dependency on SkPaintOptionsAndroid 
Change-Id: I579a3503697efe3b8fd9bc809a6c9bfbf735cb1b
 2014-08-07 14:38:51 -04:00
Santos Cordon
8abea42490 Remove ldaps from AOSP code. 
Bug: 16327484
Change-Id: I1fbeed8e1642e8228310cf0e7b95c4809b50901b
 2014-08-07 11:37:52 -07:00
Sandeep Siddhartha
70833478dd am 5885981a: Merge "Fix build break" into lmp-dev 
* commit '5885981af5d3a146c3f9a532b112b02a5e389398':
  Fix build break
 2014-08-07 18:32:41 +00:00
Winson Chung
58865b6797 am f9c1251b: Merge "Initial changes to add task affiliation styling. (Bug 16656169)" into lmp-dev 
* commit 'f9c1251b0ca90467a0532b84fc95448e10ccfb95':
  Initial changes to add task affiliation styling.  (Bug 16656169)
 2014-08-07 18:06:38 +00:00
Glenn Kasten
27ee1046a4 am cd55d2e5: Merge "Add setting to disable automatic USB audio routing" into lmp-dev 
* commit 'cd55d2e5e19eb62712c023c5eb434c096d701a26':
  Add setting to disable automatic USB audio routing
 2014-08-07 18:02:27 +00:00
Sandeep Siddhartha
e849e4aaec am e931a72d: Handle same keyphrase for multiple users 
* commit 'e931a72dcdaa01f1f4f9011472d15229cd1cfc82':
  Handle same keyphrase for multiple users
 2014-08-07 17:58:01 +00:00
Sandeep Siddhartha
ac23293c2d am b6c0b037: Merge "Read audio format from the recognition event" into lmp-dev 
* commit 'b6c0b037035bfea56de1d158fe9f1d42f0e35bca':
  Read audio format from the recognition event
 2014-08-07 17:57:56 +00:00
Sandeep Siddhartha
256e1a6267 Handle same keyphrase for multiple users 
Also notify the VIS of a change after finishing the change

Bug: 16816191
Change-Id: I6c96595819cd07182c3825c522d9bae559bb6814
 2014-08-07 10:50:18 -07:00