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

147742 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
d696634fe5 am 881f8547: Update strings for QS footer. 
* commit '881f8547013a84ac878f115e12c35c15e6727081':
  Update strings for QS footer.
 2014-08-07 20:20:10 +00:00
Michael Wright
cd4750dd60 am 97b2b671: Allow media projections to create public presentations. 
* commit '97b2b67155910079d122ecb1d2bc69c42d8e24c4':
  Allow media projections to create public presentations.
 2014-08-07 20:11:58 +00:00
Jason Monk
d3ea7d61a3 Update strings for QS footer. 
Bug: 16854706
Change-Id: Iba7ecae45f0bc9a8819f5172ad5922fddab95076
 2014-08-07 20:09:39 +00:00
Michael Wright
6720be4e8c Allow media projections to create public presentations. 
Change-Id: I3b6e0b54d658352942a38be6a24486bdfc179efd
 2014-08-07 20:07:04 +00:00
Prerepa Viswanadham
af3dec5e72 am 2792be93: OnLost/OnFound integration - onfound match is done in framework, whereas hw signal is used to report onlost. 
* commit '2792be930bb082fcd18ab47ea60fc723396144ba':
  OnLost/OnFound integration - onfound match is done in framework, whereas hw signal is used to report onlost.
 2014-08-07 19:57:10 +00:00
Prerepa Viswanadham
d5324e4183 OnLost/OnFound integration - onfound match is done in framework, 
whereas hw signal is used to report onlost.

Bug 16733710

Change-Id: I7b177b7afd730341c336818857436c095735b53b
 2014-08-07 19:51:59 +00:00
Christopher Tate
a95cd4e50d am bc835105: Merge "Reify the transport lookup/selection API" into lmp-dev 
* commit 'bc835105066725fecfe378bfdd13c2262908457f':
  Reify the transport lookup/selection API
 2014-08-07 19:48:44 +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
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
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
Adam Powell
86874c8b57 am 157fab0c: Nested pre-fling for AbsListView and ScrollView 
* commit '157fab0c71afa7b4dfb44a5d6cbb2a117cbf73a3':
  Nested pre-fling for AbsListView and ScrollView
 2014-08-07 17:31:35 +00:00
Adam Powell
9413b245a6 Nested pre-fling for AbsListView and ScrollView 
Add nested pre-fling support to all framework widgets that currently
support nested fling.

Change-Id: Ieaf9d12938dbfeea779c2aee2f5a081c287c8e96
 2014-08-07 10:24:04 -07:00
Jae Seo
f1402043d1 am 5616fe8d: TIF: Do not log non-searchable channel watch history 
* commit '5616fe8d4bf9751648670c44d95dd68d01633973':
  TIF: Do not log non-searchable channel watch history
 2014-08-07 17:05:11 +00:00
Jae Seo
579befecb2 TIF: Do not log non-searchable channel watch history 
Bug: 16798476
Change-Id: Ic131009ad65a661331e4f8f0820c5c183a9f4986
 2014-08-07 10:00:52 -07:00
Kenny Guy
10f171ff7c am d9b5ffbc: Merge "Revert "Remove String version of getBadgedLabel"" into lmp-dev 
* commit 'd9b5ffbcbdddd70158280602db3d2cfa4a31cd4a':
  Revert "Remove String version of getBadgedLabel"
 2014-08-07 16:58:42 +00:00
Ricardo Cervera
28fc0ec798 am 28e8ec9f: am 8f16c065: am 35b08bac: am edcf7c51: Merge "docs: Simplify and update the Signing page. Bug: 16296405" into klp-modular-docs 
* commit '28e8ec9f921bfca69c80dc9346a16c50028c3d6b':
  docs: Simplify and update the Signing page. Bug: 16296405
 2014-08-07 16:16:53 +00:00
Kenny Guy
717e32906c am 1f98d304: Remove LauncherApps method left for compat. 
* commit '1f98d3047688e9ad51e1afc3cea842ad68914585':
  Remove LauncherApps method left for compat.
 2014-08-07 16:16:48 +00:00
Ricardo Cervera
bdad288c96 am 8f16c065: am 35b08bac: am edcf7c51: Merge "docs: Simplify and update the Signing page. Bug: 16296405" into klp-modular-docs 
* commit '8f16c0655eb4e7321f346ed62d9068ebc9fdc35b':
  docs: Simplify and update the Signing page. Bug: 16296405
 2014-08-07 16:13:09 +00:00
Dan Sandler
11451ff400 am e23d301e: Merge "Link to new app notification settings from the inspector." into lmp-dev 
* commit 'e23d301e267c320e7e7c103d3d630e09487b3c02':
  Link to new app notification settings from the inspector.
 2014-08-07 16:12:39 +00:00
Kenny Guy
9df035b1aa am 6cfeb8dc: Merge "Remove String version of getBadgedLabel" into lmp-dev 
* commit '6cfeb8dcad12cdc3391b2f39c366ab339a6b1a06':
  Remove String version of getBadgedLabel
 2014-08-07 16:12:35 +00:00
Kenny Guy
65810072d6 Remove LauncherApps method left for compat. 
Method was left while updating unbundled apps
which have now been updated.

Bug: 16864685
Change-Id: I687cb23a1b60b88eeb988f3cf2604dc24b739121
 2014-08-07 16:09:10 +00:00
Robert Ly
03b1c44ea6 am 3b3f443a: am 001e3072: am 23daa441: am 8e115e64: Merge "docs: Documenting fix for CVE-2014-0224 (SSL vulnerability)." into klp-modular-docs 
* commit '3b3f443a7154a4c6b69445437e0b4e376ad66297':
  docs: Documenting fix for CVE-2014-0224 (SSL vulnerability).
 2014-08-07 16:08:16 +00:00
Ricardo Cervera
8f16c0655e am 35b08bac: am edcf7c51: Merge "docs: Simplify and update the Signing page. Bug: 16296405" into klp-modular-docs 
* commit '35b08bacc4e4ab937a5179b5b991f6509127f517':
  docs: Simplify and update the Signing page. Bug: 16296405
 2014-08-07 16:07:37 +00:00
Robert Ly
e915faa1d4 am 001e3072: am 23daa441: am 8e115e64: Merge "docs: Documenting fix for CVE-2014-0224 (SSL vulnerability)." into klp-modular-docs 
* commit '001e30729a7e12bef238df680626042b2e99d807':
  docs: Documenting fix for CVE-2014-0224 (SSL vulnerability).
 2014-08-07 16:04:07 +00:00
Ricardo Cervera
35b08bacc4 am edcf7c51: Merge "docs: Simplify and update the Signing page. Bug: 16296405" into klp-modular-docs 
* commit 'edcf7c51676e3b4d0481dcdc9c2e128f7f4f2e5d':
  docs: Simplify and update the Signing page. Bug: 16296405
 2014-08-07 16:03:27 +00:00
Robert Ly
001e30729a am 23daa441: am 8e115e64: Merge "docs: Documenting fix for CVE-2014-0224 (SSL vulnerability)." into klp-modular-docs 
* commit '23daa44107c17d7e30c65389bb718a9add8e4c40':
  docs: Documenting fix for CVE-2014-0224 (SSL vulnerability).
 2014-08-07 15:59:36 +00:00
Robert Ly
23daa44107 am 8e115e64: Merge "docs: Documenting fix for CVE-2014-0224 (SSL vulnerability)." into klp-modular-docs 
* commit '8e115e6460f5bfe5e682dda6e816b9d8c84bc525':
  docs: Documenting fix for CVE-2014-0224 (SSL vulnerability).
 2014-08-07 15:55:10 +00:00
Lajos Molnar
31a4ec1dfc am b18308b2: Merge "ImageReader: fix documentation, relax some guarantees" into lmp-dev 
* commit 'b18308b2b2974efbe83301f7d30511c010a55cf1':
  ImageReader: fix documentation, relax some guarantees
 2014-08-07 15:46:52 +00:00
Sandeep Siddhartha
f30fc111a3 Merge "Handle microphone contention/Phone calls while recognition is active" into lmp-dev 2014-08-07 15:42:44 +00:00
Sandeep Siddhartha
cb4e81c7fe Handle microphone contention/Phone calls while recognition is active 
Internally we pause the recognition when:
 - a phone call is active/off-hook/ringing
 - or some other application grabs the microphone

we auto-resume when the condition that caused us to pause reverses.

Both these events are notified to the client via callbacks so that they can choose to display on their UI,
that the recognition is paused for some reason.

Bug: 16515468
Bug: 16740806
Bug: 16514535
Change-Id: Ib274d68522c8cf37d42402c875b16159957657f0
 2014-08-07 11:53:02 -07:00
Sandeep Siddhartha
3da5ba05d6 Merge "Fix build break" into lmp-dev 2014-08-07 15:31:24 +00:00