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

36419 Commits

Author SHA1 Message Date
Narayan Kamath
a98bf2017e am e413dae8: am 8e96d73a: am e488f2c1: am a0b25d41: am d85bba8e: Merge "AArch64: Use long for pointers in VelocityTracker class" 
* commit 'e413dae8926f45e08e93dd9454f3b683514f3106':
  AArch64: Use long for pointers in VelocityTracker class
 2014-01-16 15:57:36 +00:00
Narayan Kamath
1bf3ab08db am c45068e4: am d7a54c65: am 31f10bb2: am 80b3dd0d: am 27a647bf: Merge "AArch64: Use long for pointers in android/os/MemoryFile" 
* commit 'c45068e4a48053447413783e549be7273e38ea97':
  AArch64: Use long for pointers in android/os/MemoryFile
 2014-01-16 15:57:29 +00:00
Narayan Kamath
d4513aea25 am a5a0d384: am 425b08f1: am c1abb5e3: am 53321d99: am f19c50d6: Merge "AArch64: Use long for pointers in KeyCharacterMap class" 
* commit 'a5a0d384fce9e9475c1414f69cb47bf6b5259a4d':
  AArch64: Use long for pointers in KeyCharacterMap class
 2014-01-16 15:57:23 +00:00
Elliott Hughes
e974f9b359 am 8bb8caa2: am c12410f1: am c3be4ba3: am 12377887: am 991e9818: Merge "AArch64: Use long for pointers in speech/srec classes" 
* commit '8bb8caa2b1c38bdc273082b710e2d089889aea5a':
  AArch64: Use long for pointers in speech/srec classes
 2014-01-16 15:47:19 +00:00
Narayan Kamath
e413dae892 am 8e96d73a: am e488f2c1: am a0b25d41: am d85bba8e: Merge "AArch64: Use long for pointers in VelocityTracker class" 
* commit '8e96d73a755348b25ceb80f907eae15be2da0d75':
  AArch64: Use long for pointers in VelocityTracker class
 2014-01-16 15:41:41 +00:00
Narayan Kamath
c45068e4a4 am d7a54c65: am 31f10bb2: am 80b3dd0d: am 27a647bf: Merge "AArch64: Use long for pointers in android/os/MemoryFile" 
* commit 'd7a54c6574c3ca759e977f27912caecb6b40e827':
  AArch64: Use long for pointers in android/os/MemoryFile
 2014-01-16 15:41:35 +00:00
Narayan Kamath
a5a0d384fc am 425b08f1: am c1abb5e3: am 53321d99: am f19c50d6: Merge "AArch64: Use long for pointers in KeyCharacterMap class" 
* commit '425b08f14419a1e67a3d9d2c9b97ea61ecd4f5cb':
  AArch64: Use long for pointers in KeyCharacterMap class
 2014-01-16 15:41:30 +00:00
Elliott Hughes
8bb8caa2b1 am c12410f1: am c3be4ba3: am 12377887: am 991e9818: Merge "AArch64: Use long for pointers in speech/srec classes" 
* commit 'c12410f1a3b951126a02ad5fe4160bc830a860ec':
  AArch64: Use long for pointers in speech/srec classes
 2014-01-16 15:41:18 +00:00
Narayan Kamath
8e96d73a75 am e488f2c1: am a0b25d41: am d85bba8e: Merge "AArch64: Use long for pointers in VelocityTracker class" 
* commit 'e488f2c154f089141709279dd93bcd641c85659b':
  AArch64: Use long for pointers in VelocityTracker class
 2014-01-16 15:38:05 +00:00
Narayan Kamath
d7a54c6574 am 31f10bb2: am 80b3dd0d: am 27a647bf: Merge "AArch64: Use long for pointers in android/os/MemoryFile" 
* commit '31f10bb21b24824c5dbf60b420239513f02b9e55':
  AArch64: Use long for pointers in android/os/MemoryFile
 2014-01-16 15:38:00 +00:00
Narayan Kamath
425b08f144 am c1abb5e3: am 53321d99: am f19c50d6: Merge "AArch64: Use long for pointers in KeyCharacterMap class" 
* commit 'c1abb5e3957f6abdd9cea8f2717290a3f130a216':
  AArch64: Use long for pointers in KeyCharacterMap class
 2014-01-16 15:37:55 +00:00
Elliott Hughes
c12410f1a3 am c3be4ba3: am 12377887: am 991e9818: Merge "AArch64: Use long for pointers in speech/srec classes" 
* commit 'c3be4ba304196f1624818dce3da43492156b62fe':
  AArch64: Use long for pointers in speech/srec classes
 2014-01-16 15:37:45 +00:00
Narayan Kamath
e488f2c154 am a0b25d41: am d85bba8e: Merge "AArch64: Use long for pointers in VelocityTracker class" 
* commit 'a0b25d41d556d2c37852b6036aaf6f33b0e8c5a8':
  AArch64: Use long for pointers in VelocityTracker class
 2014-01-16 07:34:57 -08:00
Narayan Kamath
31f10bb21b am 80b3dd0d: am 27a647bf: Merge "AArch64: Use long for pointers in android/os/MemoryFile" 
* commit '80b3dd0d8e333905e9f2a3a844bc524d41df7da2':
  AArch64: Use long for pointers in android/os/MemoryFile
 2014-01-16 07:34:53 -08:00
Narayan Kamath
c1abb5e395 am 53321d99: am f19c50d6: Merge "AArch64: Use long for pointers in KeyCharacterMap class" 
* commit '53321d9990cae810da28b7ae9f6f9b3fe7455020':
  AArch64: Use long for pointers in KeyCharacterMap class
 2014-01-16 07:34:48 -08:00
Elliott Hughes
c3be4ba304 am 12377887: am 991e9818: Merge "AArch64: Use long for pointers in speech/srec classes" 
* commit '12377887e3a74a69100071e0a383f6d9a54046c9':
  AArch64: Use long for pointers in speech/srec classes
 2014-01-16 07:34:39 -08:00
Craig Mautner
fc8fa54f80 am e9ddaa0b: Merge "Cleanup after ActivityView" into klp-modular-dev 
* commit 'e9ddaa0b183d979be782a63970929cebd861b7c9':
  Cleanup after ActivityView
 2014-01-16 15:22:15 +00:00
Narayan Kamath
d85bba8ebd Merge "AArch64: Use long for pointers in VelocityTracker class" 2014-01-16 12:11:51 +00:00
Narayan Kamath
27a647bf38 Merge "AArch64: Use long for pointers in android/os/MemoryFile" 2014-01-16 12:11:47 +00:00
Narayan Kamath
f19c50d657 Merge "AArch64: Use long for pointers in KeyCharacterMap class" 2014-01-16 12:11:42 +00:00
Dianne Hackborn
c46809e997 Whoops add a line separator. 
Change-Id: Ie596527a39319fcf3f80a444fed9e62f90163ea5
 2014-01-15 17:53:02 -08:00
Craig Mautner
e9ddaa0b18 Merge "Cleanup after ActivityView" into klp-modular-dev 2014-01-16 01:49:24 +00:00
Craig Mautner
34b73dfaa3 Cleanup after ActivityView 
- Release Surface and VirtualDisplay when shutting down ActivityView.
- Shut down child stacks when relaunching parent activity.

Change-Id: I60314b2b43bd2da5406cf6ec871293b5baca157c
 2014-01-15 17:47:51 -08:00
Dianne Hackborn
c8345b32c9 Merge "Add battery power use reporting to batterystats service." 2014-01-16 01:39:06 +00:00
Ashok Bhat
bdebe1ad95 AArch64: Use long for pointers in speech/srec classes 
For storing pointers, long is used in speech/srec classes,
as native pointers can be 64-bit.

Note corresponding JNI files are in the external/srec project
under srec_jni directory.

Change-Id: Iacd10840e81f5acc3eb202424f83b49ae4eb23ab
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
 2014-01-15 17:38:06 -08:00
Jeff Sharkey
4ca728c064 Detect removable and emulated secondary storage. 
Also rename existing secondary storage API to match naming
convention in rest of class.

Bug: 11536709
Change-Id: I2684c817de4982b414893d2d9927a21e3f171d53
 2014-01-15 17:00:56 -08:00
Dianne Hackborn
a7c837f043 Add battery power use reporting to batterystats service. 
Move the BatteryStatsHelper class (which computes power use based
on the raw battery stats) out of the settings app and in to the
framework.  It is now used by batterystats dump output to print
the computed power information from its current stats.

This involved a lot of refactoring of the BatteryStatsHelper code
to remove all of the UI dependencies.  I also did a bunch of cleanup
in it, such as making all power computations be in terms of mAh.

Change-Id: I8ccf2c9789dc9ad34904917ef57050371a59dc28
 2014-01-15 16:20:44 -08:00
Igor Murashkin
aef3b7ed9f camera2: @hide android.statistics.predictedColor* 
Change-Id: I8c1b7596c1e0c311a4f9fabdd5de72b4b7b372b5
 2014-01-15 13:28:19 -08:00
Igor Murashkin
3242f4fb19 camera2: Fix @see being emitted into middle of javadoc (+more) 
Other minor fixes:
- javadoc optional/FULL correctly emitted for properties lacking details
- javadoc details being incorrectly dedented before being rendered by
  markdown, causing spurious <code> blocks to be emitted

Bug: 12552669
Change-Id: I4c6615ec47810757b8348995db2b199222a3a77e
 2014-01-15 12:27:41 -08:00
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
ac20b46925 am 6c13f384: am 56b11064: am 9a5005a3: am f6730d26: Merge "Add sample profiling interface to startMethodTracing." 
* commit '6c13f384749150e9fa6f930023a9161fe97402d0':
  Add sample profiling interface to startMethodTracing.
 2014-01-15 19:48:18 +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
Zhijun He
399f05d1e7 Camera2: Update awbMode related javadoc spec 
Change-Id: I999d2bc94834c6f6d4483493707f05c92d7c5d67
 2014-01-15 11:31: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 Reck
81155da284 Merge "Remove dead code" 2014-01-15 18:57:13 +00:00
John Reck
2114aef4ea Remove dead code 
Change-Id: I9c96d3d21bd3faed91a5146f5a2b8916c634fdff
 2014-01-15 09:37:38 -08:00
Marco Nelissen
7a993a3d54 am 4e53edf7: am e495a5a3: am cb15fb60: am 0d4916f1: am c3036a12: Merge "Before requerying a cursor, check if it is closed." 
* commit '4e53edf7ea8f8158a123a451530146f23e3fed81':
  Before requerying a cursor, check if it is closed.
 2014-01-15 17:33:42 +00:00
Marco Nelissen
4e53edf7ea am e495a5a3: am cb15fb60: am 0d4916f1: am c3036a12: Merge "Before requerying a cursor, check if it is closed." 
* commit 'e495a5a3f3feec6319262a6bdab3b7704d6ab843':
  Before requerying a cursor, check if it is closed.
 2014-01-15 17:29:43 +00:00
Marco Nelissen
e495a5a3f3 am cb15fb60: am 0d4916f1: am c3036a12: Merge "Before requerying a cursor, check if it is closed." 
* commit 'cb15fb6041e604025d4b76645435f8cbafee754c':
  Before requerying a cursor, check if it is closed.
 2014-01-15 17:27:19 +00:00
Marco Nelissen
cb15fb6041 am 0d4916f1: am c3036a12: Merge "Before requerying a cursor, check if it is closed." 
* commit '0d4916f19f81f80fc83eb7646c6d339630d5f618':
  Before requerying a cursor, check if it is closed.
 2014-01-15 09:22:55 -08:00
Marco Nelissen
c3036a1246 Merge "Before requerying a cursor, check if it is closed." 2014-01-15 17:17:05 +00:00
Zhijun He
78146ecb24 Camera2: Update AF mode related javadoc specs 
Change-Id: If7a0de76f660ade25d9fdb92458fbe7e9752d0dd
 2014-01-14 18:12:13 -08:00
Zhijun He
fb46c644ce Camera2: metadata tag javadoc update 
Change-Id: I66700340780f3185796f25c054487f439f24a6fb
 2014-01-14 17:57:23 -08:00
Alan Viverette
4b95cc7ef7 Quick fix for updating the FastScroller long list property 
BUG: 12553181
Change-Id: I5305b0ec4ae8e069fc98d45dc3d5daaa0628ca79
 2014-01-14 16:54:02 -08:00
Matthew Xie
91da5b6830 Merge changes I86b3fa60,I7fa4e847 into klp-modular-dev 
* changes:
  BLE peripheral mode (3/4): Add peripheral mode API.
  NPE in BluetoothSocket.write()
 2014-01-14 20:44:16 +00: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
4b67b88e34 am cce06eda: am b3436359: am e05190ea: am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs 
* commit 'cce06eda6bd6af957b261f66eb8ea3623fe09caf':
  Docfixes: three typos and escape */*.
 2014-01-14 20:00:42 +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