Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,151 Commits 3 Branches 0 Tags
dd8877bceddfda9f1802fa01ac662b22bc8c9020
Commit Graph

1552 Commits

Author SHA1 Message Date
Jeff Hao
70216e599e am ac20b469: am 6c13f384: am 56b11064: am 9a5005a3: am f6730d26: Merge "Add sample profiling interface to startMethodTracing." 
* commit 'ac20b469259129df948bae1fa5434098b1801185':
  Add sample profiling interface to startMethodTracing.
 2014-01-15 19:50:53 +00:00
Jeff Hao
6c13f38474 am 56b11064: am 9a5005a3: am f6730d26: Merge "Add sample profiling interface to startMethodTracing." 
* commit '56b110649424534de36ca41b3e352a73b6bdf3c0':
  Add sample profiling interface to startMethodTracing.
 2014-01-15 19:45:06 +00:00
Jeff Hao
56b1106494 am 9a5005a3: am f6730d26: Merge "Add sample profiling interface to startMethodTracing." 
* commit '9a5005a3bfa419cb856a83ca34a67556d9fd5b74':
  Add sample profiling interface to startMethodTracing.
 2014-01-15 11:41:30 -08:00
Jeff Hao
d02e60fbd4 Add sample profiling interface to startMethodTracing. 
Frameworks base side of this change. Also changed art and libcore.

Change-Id: Ib5ba0445163dca714d1ae66430750346ff8811be
 2014-01-15 11:27:24 -08:00
John Spurlock
88926a5482 am 4b67b88e: am cce06eda: am b3436359: am e05190ea: am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs 
* commit '4b67b88e344a147317fc6b32e5364d4cfabf1e1d':
  Docfixes: three typos and escape */*.
 2014-01-14 20:04:25 +00:00
John Spurlock
cce06eda6b am b3436359: am e05190ea: am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs 
* commit 'b34363590953e4efd70168cdf03386d1e469a548':
  Docfixes: three typos and escape */*.
 2014-01-14 19:57:02 +00:00
John Spurlock
b343635909 am e05190ea: am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs 
* commit 'e05190eae74be57dd517bb5afbccf901543329bf':
  Docfixes: three typos and escape */*.
 2014-01-14 11:54:25 -08:00
John Spurlock
e05190eae7 am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs 
* commit '85f98508366e8422f71553d2a5e682eb804c7419':
  Docfixes: three typos and escape */*.
 2014-01-14 19:50:38 +00:00
John Spurlock
5002b8c972 Use custom classloader if provided for Serializables. 
If an explicit classloader is provided during unparcel, use it
when deserializing java serializables.

Change-Id: I2b354f0b55359201528234b8095aa0bc102928ec
 2014-01-10 13:34:00 -05:00
John Spurlock
3390018c6b Docfixes: three typos and escape */*. 
Change-Id: I418d855b5d08a1a20eaca3d8e4d2e5d0fca23dd5
 2014-01-06 11:44:42 -05:00
Todd Poynor
91ecb36df5 ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE 
Change-Id: Ie2f8af1e411c28d7f03be56c356ec39e1d71558e
 2014-01-03 16:30:25 -08:00
David Christie
a8cf4f2fd1 Document that Handler.postDelayed uses uptimeMillis() based counting. 
-Make it clear that delay may be longer than requested.
-Potentially help developers avoid power bugs (e.g. releasing after delay).
Bug: 12015795

Change-Id: I8034466f6307f64bfcad985948c1dc06872297d3
 2013-12-19 18:37:01 -08:00
Dianne Hackborn
57ed6a6440 Improvements to battery stats. 
Now collect per-network packet usage data.

Big reworking of history to be able to start adding more events to it.
Also rework how the checking dump is done to make it more compact, so
maybe we can start uploading it.

Change-Id: I2b29e049ebe073671d0dbe38324223cc2ec0d043
 2013-12-19 13:09:51 -08:00
Marco Nelissen
09cee9d21f am 4f6a1394: am c680bab3: am 69b46707: am ce3bd309: Merge "Parse UUID string with Long.parseLong" 
* commit '4f6a139493e922f2db5e4ee7bb5364e4f8487322':
  Parse UUID string with Long.parseLong
 2013-12-11 22:42:02 +00:00
Marco Nelissen
69b4670730 am ce3bd309: Merge "Parse UUID string with Long.parseLong" 
* commit 'ce3bd309b12e9552c05d5a59a06d7883618c5ca0':
  Parse UUID string with Long.parseLong
 2013-12-11 10:14:56 -08:00
Tom Marshall
17d5c1b181 Parse UUID string with Long.parseLong 
Integer.parseInt throws an NPE for values greater than 0x7fffffff.
 2013-12-06 21:04:25 +01:00
Dirk Dougherty
64fe2b3a33 am 3eddb621: am a40420c9: am 43eea0a6: Merge "Doc change: Change description for BRAND. Bug:11431921" into klp-docs 
* commit '3eddb6213dc017c78e6d641f7f4a4685db09851e':
  Doc change: Change description for BRAND. Bug:11431921
 2013-11-21 11:57:32 -08:00
Dirk Dougherty
3eddb6213d am a40420c9: am 43eea0a6: Merge "Doc change: Change description for BRAND. Bug:11431921" into klp-docs 
* commit 'a40420c9c1c8216fd0251dc550bb22e9cc1dd177':
  Doc change: Change description for BRAND. Bug:11431921
 2013-11-21 11:53:27 -08:00
Dirk Dougherty
a40420c9c1 am 43eea0a6: Merge "Doc change: Change description for BRAND. Bug:11431921" into klp-docs 
* commit '43eea0a640db07c4da05146f7e68eae567592bdb':
  Doc change: Change description for BRAND. Bug:11431921
 2013-11-21 19:49:46 +00:00
Dirk Dougherty
491b40d752 Doc change: Change description for BRAND. 
Bug:11431921

Change-Id: Id08bb58a52699942e0cf626aeb577ac05c84c575
 2013-11-21 09:31:40 -08:00
John Spurlock
6090995951 Remove unused imports from frameworks/base. 
Change-Id: Ia1f99bd2c1105b0b0f70aa614f1f4a67b2840906
 2013-11-20 11:31:47 -05:00
Dianne Hackborn
b25b890126 am 6f5d8537: am 47b260d0: am 572b759a: Merge "Use index in SparseArray access properly" 
* commit '6f5d85377be86f6d2856470788471bdda5832366':
  Use index in SparseArray access properly
 2013-11-14 16:42:04 -08:00
Dianne Hackborn
6f5d85377b am 47b260d0: am 572b759a: Merge "Use index in SparseArray access properly" 
* commit '47b260d071859a8c20bb0af2bcc095e253f7046c':
  Use index in SparseArray access properly
 2013-11-14 16:37:55 -08:00
Scott Main
72cd81db36 am af623b99: am bb146981: am 29610421: Merge "Revised some text while reading up on traceview. this is what\'s left of this older CL that was left for dead: I5528b476d8110df51d45aaf690d878f72bc75c9f" into klp-docs 
* commit 'af623b99dafbc16effc7b05de833e842654b75e1':
  Revised some text while reading up on traceview. this is what's left of this older CL that was left for dead: I5528b476d8110df51d45aaf690d878f72bc75c9f
 2013-11-12 19:29:11 -08:00
Scott Main
af623b99da am bb146981: am 29610421: Merge "Revised some text while reading up on traceview. this is what\'s left of this older CL that was left for dead: I5528b476d8110df51d45aaf690d878f72bc75c9f" into klp-docs 
* commit 'bb1469816451aeb24eb8208fac1f2596f528aa80':
  Revised some text while reading up on traceview. this is what's left of this older CL that was left for dead: I5528b476d8110df51d45aaf690d878f72bc75c9f
 2013-11-12 18:58:13 -08:00
Igor Chernyshev
b94d654d36 Use index in SparseArray access properly 
The original code was calling get() rather than valueAt(),
treating index as if it was a key.

Change-Id: I52539dfcb49b3d2ee3cb027d38c50b46f73b5ee7
Signed-off-by: Igor Chernyshev <igorc@google.com>
 2013-11-12 18:56:21 -08:00
Scott Main
bb14698164 am 29610421: Merge "Revised some text while reading up on traceview. this is what\'s left of this older CL that was left for dead: I5528b476d8110df51d45aaf690d878f72bc75c9f" into klp-docs 
* commit '29610421a32501661d6c20136c76ec426d6500fb':
  Revised some text while reading up on traceview. this is what's left of this older CL that was left for dead: I5528b476d8110df51d45aaf690d878f72bc75c9f
 2013-11-13 02:53:40 +00:00
Scott Main
c468240c1a Revised some text while reading up on traceview. 
this is what's left of this older CL that was left for dead:
I5528b476d8110df51d45aaf690d878f72bc75c9f

Change-Id: I42f784d693c0a2a2e2e8ed4c582cbc10180191e7
 2013-11-12 18:49:21 -08:00
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