Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
119,701 Commits 3 Branches 0 Tags
e5347dfffa186ca4dcfd874673d929fcf9308fc0
Commit Graph

1524 Commits

Author SHA1 Message Date
Robert Greenwalt
d528d48e5d resolved conflicts for merge of c3eef190 to master 
Change-Id: I36fd3c7fcbb13e47e27ffc340484c03b5a553bb1
 2013-11-07 15:05:26 -08:00
Robert Greenwalt
c3eef19047 am f1612bcf: am e8c51298: Merge "Add BatteryStats for Wifi Batched Scanning." into klp-dev 
* commit 'f1612bcfdd2cb517948f14369fd0977ceb55d19c':
  Add BatteryStats for Wifi Batched Scanning.
 2013-11-07 10:39:43 -08:00
Robert Greenwalt
a029ea1318 Add BatteryStats for Wifi Batched Scanning. 
bug:10690989
Change-Id: Ia39b715ee6d5733970095bc76de0ed40ff8208c0
 2013-11-06 17:43:18 -08:00
Patrick Tjin
09e0244f72 am b4328566: am 5eecb9e8: am bd9513f3: Merge "Add HSPA+ to BatteryStats" into klp-dev 
* commit 'b4328566fa415b69974a9721ec690a1b74880873':
  Add HSPA+ to BatteryStats
 2013-11-06 10:22:32 -08:00
Patrick Tjin
b4328566fa am 5eecb9e8: am bd9513f3: Merge "Add HSPA+ to BatteryStats" into klp-dev 
* commit '5eecb9e8d44b3864a3261a3c5ebfbb9c606e77f5':
  Add HSPA+ to BatteryStats
 2013-11-06 10:20:00 -08:00
Patrick Tjin
b71703cfdf Add HSPA+ to BatteryStats 
HSPA+ was being shown as connection type other in battery
statistics because it was not updated when TelephonyManager
was changed.

Bug: 11552902
Change-Id: I85ce7c393bf93010a4ac8437f14684015ad0391a
 2013-11-06 17:29:33 +00:00
Jeff Brown
aa2f9f01fa am 81b7caf0: resolved conflicts for merge of 5214dae4 to klp-dev-plus-aosp 
* commit '81b7caf0d12fb56ab40592467d6b1cbcaef8f0b4':
  handle negative temperature
 2013-10-29 18:32:29 -07:00
Jeff Brown
81b7caf0d1 resolved conflicts for merge of 5214dae4 to klp-dev-plus-aosp 
Change-Id: I769e7acbe207b9c3a60ff1576d11b3ab40b8c66d
 2013-10-29 18:28:57 -07:00
Jeff Sharkey
e4d5f6e24e am 8f541938: am 23ac234e: am 704269ec: Merge "Mention external storage changes in KITKAT docs." into klp-dev 
* commit '8f5419383283c6e82d2038ca807c3c55281d8fa2':
  Mention external storage changes in KITKAT docs.
 2013-10-29 14:59:32 -07:00
Jeff Brown
6dbbba4e9a Merge "handle negative temperature" 2013-10-29 20:59:38 +00:00
Jeff Sharkey
8f54193832 am 23ac234e: am 704269ec: Merge "Mention external storage changes in KITKAT docs." into klp-dev 
* commit '23ac234e9049512696c7e7c6f277e334fde50f7a':
  Mention external storage changes in KITKAT docs.
 2013-10-29 13:52:58 -07:00
Jeff Sharkey
3ec2f60ebd Mention external storage changes in KITKAT docs. 
Bug: 11388971
Change-Id: I97145472948867f54125f1d0f0237bf3b339535e
 2013-10-29 12:23:19 -07:00
Marco Nelissen
a22010ebe5 am d19385bf: am 21657181: Merge "Add a method to set a list of uids for a wake lock" into klp-dev 
* commit 'd19385bf58225069c8ea0a7ce5075ed28861b039':
  Add a method to set a list of uids for a wake lock
 2013-10-25 15:01:34 -07:00
Marco Nelissen
2165718153 Merge "Add a method to set a list of uids for a wake lock" into klp-dev 2013-10-25 21:55:55 +00:00
Jeff Sharkey
92706ac8df am d8a81d06: am fd38f940: am ac4bf7fd: Merge "Skip writing PFD status when comm is closed." into klp-dev 
* commit 'd8a81d06e4649498b3ba884f2e5443701e13d023':
  Skip writing PFD status when comm is closed.
 2013-10-25 13:28:50 -07:00
Jeff Sharkey
d8a81d06e4 am fd38f940: am ac4bf7fd: Merge "Skip writing PFD status when comm is closed." into klp-dev 
* commit 'fd38f940f4283f9ea68142185426a7cf45d58ae0':
  Skip writing PFD status when comm is closed.
 2013-10-25 13:25:31 -07:00
Jeff Sharkey
ac4bf7fd9a Merge "Skip writing PFD status when comm is closed." into klp-dev 2013-10-25 20:17:03 +00:00
Marco Nelissen
738ffdc9da Add a method to set a list of uids for a wake lock 
Cherrypicked from master.

b/9464621

Change-Id: Ia6a9d36d55129ae87d3ec070fbf10dc02f4b6cb4
 2013-10-25 12:49:55 -07:00
Dianne Hackborn
27dab38891 am f09a1b88: am aec8fbb3: am df033aed: Merge "Fix issue #11290095: Parcel change causing crashing in KLP..." into klp-dev 
* commit 'f09a1b88ae87abb750bda62f97fce1633a9cab7d':
  Fix issue #11290095: Parcel change causing crashing in KLP...
 2013-10-25 12:26:43 -07:00
Dianne Hackborn
f09a1b88ae am aec8fbb3: am df033aed: Merge "Fix issue #11290095: Parcel change causing crashing in KLP..." into klp-dev 
* commit 'aec8fbb354621dc49a4ac971a64706bee01e5806':
  Fix issue #11290095: Parcel change causing crashing in KLP...
 2013-10-25 12:21:26 -07:00
Jeff Sharkey
d99f9caba6 Skip writing PFD status when comm is closed. 
If the remote side of PFD has already written a status message, then
they've also closed their end of the comm FD, and we're going to
EPIPE if we try sending our own status.  So, skip writing status if
a remote status is present.

Only one end of the openFile() comm socket needs to be blocking,
otherwise detachFd() would end up blocking forever.

Bug: 11385467
Change-Id: I346d40cc1ca4a6683cec4c2d2b7db2b32ac94a55
 2013-10-25 11:34:35 -07:00
Dianne Hackborn
8aee64d18b Fix issue #11290095: Parcel change causing crashing in KLP... 
...when reading from empty byte[]

Better handling of empty bundles and parcels.

Change-Id: Ie9182e43a52b8f163e8fb20bd1d110e0832683e6
 2013-10-25 10:41:50 -07:00
Todd Poynor
50ae385894 BatteryService: remove dumpsys-only info duplicated by systemhealth 
Change-Id: I7fa605304b5f62ea19bcf3851d11abe7bf6c83f5
 2013-10-23 00:15:08 +00:00
Marco Nelissen
c8c2594381 Merge "Add a method to set a list of uids for a wake lock" 2013-10-18 14:28:45 +00:00
Jeff Brown
b1eb620219 am 83bf4404: am 3e3296e5: am 82f31701: Merge "Log view root, input and looper state in bug reports." into klp-dev 
* commit '83bf440440309a394f792e3d8a6acb98197d9d7c':
  Log view root, input and looper state in bug reports.
 2013-10-17 19:28:23 -07:00
Jeff Brown
83bf440440 am 3e3296e5: am 82f31701: Merge "Log view root, input and looper state in bug reports." into klp-dev 
* commit '3e3296e526663306237fe551527146286e14f4e4':
  Log view root, input and looper state in bug reports.
 2013-10-17 19:13:30 -07:00
Jeff Brown
82f3170114 Merge "Log view root, input and looper state in bug reports." into klp-dev 2013-10-18 02:08:20 +00:00
Jeff Sharkey
eeb58c79c0 am 703840da: am 1a5804d7: am 0c0f1e2e: Merge "Include external storage devices in DocumentsUI." into klp-dev 
* commit '703840da8a33c703f2d787526438c650b0318845':
  Include external storage devices in DocumentsUI.
 2013-10-17 18:55:22 -07:00
Jeff Sharkey
db289e0ac7 am 47938450: am 306bb90d: am 8f4c15d8: Merge "Plumb through physical device UUID and label." into klp-dev 
* commit '47938450b4d19f60edf774c8f451d53aa110ea0b':
  Plumb through physical device UUID and label.
 2013-10-17 18:55:13 -07:00
Jeff Sharkey
703840da8a am 1a5804d7: am 0c0f1e2e: Merge "Include external storage devices in DocumentsUI." into klp-dev 
* commit '1a5804d7aa253432f37fbd5d8eb89ac363501fe9':
  Include external storage devices in DocumentsUI.
 2013-10-17 18:53:26 -07:00
Jeff Sharkey
47938450b4 am 306bb90d: am 8f4c15d8: Merge "Plumb through physical device UUID and label." into klp-dev 
* commit '306bb90d97da583c3728d35073ebcb7f7ca5c467':
  Plumb through physical device UUID and label.
 2013-10-17 18:53:15 -07:00
Jeff Sharkey
1f706c6cd1 Include external storage devices in DocumentsUI. 
Include volume UUID in generated document IDs to uniquely identify
volumes over time.  Show volume label to users.  Watch for mount
changes to update available roots.

Bug: 11175082
Change-Id: Ia151bde768587468efde0c1d97a740b5353d1582
 2013-10-17 10:55:32 -07:00
Jeff Sharkey
5aca2b8dc4 Plumb through physical device UUID and label. 
vold now parse out UUID and label for inserted physical devices,
and reports them to framework.  Add these to hidden StorageVolume
class for use by DocumentsUI and MediaProvider.

Remove last JNI method in FileUtils!

Bug: 11175082
Change-Id: I1cfcd1ade61767b103f693319ea2600008ee2e3c
 2013-10-16 16:34:21 -07:00
Marco Nelissen
1125235da1 Add a method to set a list of uids for a wake lock 
Change-Id: Ia6a9d36d55129ae87d3ec070fbf10dc02f4b6cb4
 2013-10-16 12:56:34 -07:00
Jeff Brown
5182c780a8 Log view root, input and looper state in bug reports. 
Bug: 10948648
Change-Id: I956cce2a0fb516c02f9bbbc021f6238bcb226891
 2013-10-15 20:31:52 -07:00
Jeff Sharkey
3e41d9bf41 am fc7c4b9d: am 2a48dbce: am 905c50a2: Merge "Improve DocumentsProvider and contract docs." into klp-dev 
* commit 'fc7c4b9d7234b645adb31cb819b75ba925adab7a':
  Improve DocumentsProvider and contract docs.
 2013-10-15 17:55:45 -07:00
Jeff Sharkey
fc7c4b9d72 am 2a48dbce: am 905c50a2: Merge "Improve DocumentsProvider and contract docs." into klp-dev 
* commit '2a48dbcee91a3a37dacaa96763c92f116d916a15':
  Improve DocumentsProvider and contract docs.
 2013-10-15 17:52:29 -07:00
Jeff Sharkey
e8c00d8ed4 Improve DocumentsProvider and contract docs. 
Bug: 10567557
Change-Id: I71e7f7ad172e9986e58b9c9533b1c948c5530397
 2013-10-15 16:44:22 -07:00
Jeff Sharkey
91695305f2 am 881cde33: am 16c4b8c5: am ddf5a170: Merge "Relax user constraint on storage state." into klp-dev 
* commit '881cde33589859e23a0af0a08b3c59d2f90cfd10':
  Relax user constraint on storage state.
 2013-10-15 04:02:52 -07:00
Jeff Sharkey
881cde3358 am 16c4b8c5: am ddf5a170: Merge "Relax user constraint on storage state." into klp-dev 
* commit '16c4b8c5999b4365bde5ad7c2f00337cee988dab':
  Relax user constraint on storage state.
 2013-10-14 19:01:30 -07:00
Jeff Sharkey
a6d1999529 Relax user constraint on storage state. 
Otherwise we wtf() when called various places in the system.

Bug: 11223886
Change-Id: I514d28603db02e3debd4af1cf20049af0c7399f4
 2013-10-14 16:43:42 -07:00
Kenny Root
183cd0ca64 am 7a2f4ae1: am 69779458: am 7878883e: Merge "Remove direct reference to X509CertImpl" 
* commit '7a2f4ae13223bb804417e9ce3294b22bd9bda49a':
  Remove direct reference to X509CertImpl
 2013-10-14 14:07:05 -07:00
Kenny Root
7a2f4ae132 am 69779458: am 7878883e: Merge "Remove direct reference to X509CertImpl" 
* commit '69779458aeef3fa9d9c6f54487784cf558c850e8':
  Remove direct reference to X509CertImpl
 2013-10-14 14:04:55 -07:00
Kenny Root
27e549428e Remove direct reference to X509CertImpl 
This should use the system default X.509 certificate provider.

Change-Id: Ibdfd800a9d10f9dc566a360401efe7c3dc6cef5d
 2013-10-14 13:39:43 -07:00
Jeff Sharkey
f22abb961b am ac50f60d: am 58ff8af5: am a6af40cd: Merge "Add secondary external storage support." into klp-dev 
* commit 'ac50f60da6ae9943321d4fe945e81d14dff0d4c2':
  Add secondary external storage support.
 2013-10-08 16:02:40 -07:00
Jeff Sharkey
ac50f60da6 am 58ff8af5: am a6af40cd: Merge "Add secondary external storage support." into klp-dev 
* commit '58ff8af53a8378ee50375b039c390ca7f0a29126':
  Add secondary external storage support.
 2013-10-08 14:12:37 -07:00
Jeff Sharkey
44cbdec292 Add secondary external storage support. 
When SECONDARY_STORAGE is defined by the hardware configuration,
include those paths in the new getExternalCacheDirs() and
getExternalFilesDirs() APIs.  Give secondary volumes valid state
until vold reports back.

Bug: 10330128, 10330229
Change-Id: Ifa55bfda47fd7c750f462dd26c98792ad462ab91
 2013-10-08 12:57:11 -07:00
Dianne Hackborn
a37bbc6afc am 8a5f7ab6: am 22c298a5: am 7192c6d7: Merge "KLP/KitKat is now API 19." into klp-dev 
* commit '8a5f7ab6e18e05a54a3ae7e0acb7e1b728ad613c':
  KLP/KitKat is now API 19.
 2013-10-04 09:11:32 -07:00
Dianne Hackborn
6588538ec5 am 7c55154d: am 80e75d39: am 0d763a90: Merge "Implement issue #11050739: Show swapped out RAM" into klp-dev 
* commit '7c55154d4776896c3e602f4739fd5b9cbbf1dba4':
  Implement issue #11050739: Show swapped out RAM
 2013-10-04 09:11:17 -07:00
Dianne Hackborn
4bfeed9499 am 61509ca5: am 479dde0b: am 6a6f96a2: Merge "Fix issue #10378741: configupdater needs to be explicit when it calls startService()" into klp-dev 
* commit '61509ca5bafbe59e29e1eaaaa938c5a668352cba':
  Fix issue #10378741: configupdater needs to be explicit when it calls startService()
 2013-10-04 09:11:14 -07:00