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

121447 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glenn Kasten
44e26f2f5c Merge "Prepare for additional formats beyond 8-bit and 16-bit PCM" 2013-12-20 15:37:16 +00:00
David Christie
3bc26143dc Fix issue where gps "on" stats continue to run when gps is disabled. 
-Shows up in Settings->Battery->app_detail_page
-Bug: 12015795

Change-Id: Id1485eed72e22cffb3e6e306495fac37a4d348cc
 2013-12-19 17:22:23 -08:00
Alan Viverette
ca7a257628 Merge "Add APIs and implementation for additional caption edge types" 2013-12-20 00:40:36 +00:00
Marco Nelissen
e754e7880a Merge "libexif is now libjhead" 2013-12-19 23:36:10 +00:00
Amith Yamasani
1f4bf364b2 Merge "Move files to new directory structure of framework services" 2013-12-19 23:32:03 +00:00
Amith Yamasani
49782e46c0 am 9158825f: Move some system services to separate directories 
* commit '9158825f9c41869689d6b1786d7c7aa8bdd524ce':
  Move some system services to separate directories
 2013-12-19 23:30:35 +00:00
Amith Yamasani
9158825f9c Move some system services to separate directories 
Refactored the directory structure so that services can be optionally
excluded. This is step 1. Will be followed by another change that makes
it possible to remove services from the build.

Change-Id: Ideacedfd34b5e213217ad3ff4ebb21c4a8e73f85
 2013-12-19 15:25:37 -08:00
Amith Yamasani
19c662b3df Move files to new directory structure of framework services 
Change-Id: I6239d90fa0b813e37878f8fc31caf7a2d70fa3ba
 2013-12-19 15:20:43 -08:00
Dianne Hackborn
4dace6f66d Merge "Improvements to battery stats." 2013-12-19 22:51:35 +00:00
Marco Nelissen
7f6abf84ab libexif is now libjhead 
Change-Id: I6b749e251a2e03738550ce911e59527f80d26212
 2013-12-19 14:21:19 -08:00
David Friedman
e32599375e am 30d03292: am cdfed85a: am 51834f74: am c18061d5: am 7cd6cd31: NDK release notes for r9c for review 
* commit '30d032928a294fbb6f385e9d0367a75b7bf2649b':
  NDK release notes for r9c for review
 2013-12-19 22:05:42 +00:00
David Friedman
30d032928a am cdfed85a: am 51834f74: am c18061d5: am 7cd6cd31: NDK release notes for r9c for review 
* commit 'cdfed85aa4f8e540d3b7079922a09e05ddd4c944':
  NDK release notes for r9c for review
 2013-12-19 21:59:11 +00:00
David Friedman
cdfed85aa4 am 51834f74: am c18061d5: am 7cd6cd31: NDK release notes for r9c for review 
* commit '51834f74e627dda63f3868fc51fd29a26cda5492':
  NDK release notes for r9c for review
 2013-12-19 21:56:58 +00:00
David Friedman
51834f74e6 am c18061d5: am 7cd6cd31: NDK release notes for r9c for review 
* commit 'c18061d5351fa4170b0b446fbea6300283789403':
  NDK release notes for r9c for review
 2013-12-19 13:53:58 -08:00
David Friedman
c18061d535 am 7cd6cd31: NDK release notes for r9c for review 
* commit '7cd6cd3178b8fb3b25a2c2ddeaff2733bfab9f43':
  NDK release notes for r9c for review
 2013-12-19 21:51:22 +00:00
Glenn Kasten
a5a4238436 Prepare for additional formats beyond 8-bit and 16-bit PCM 
Factor out code that converts from Java ENCODING_PCM_* to native
AUDIO_FORMAT_* into a new function audioFormatToNative().

Also use audio_bytes_per_sample() from <system/audio.h>
instead of hard-coding the size of various formats.

Use size_t for memory sizes.

Change-Id: Ic3525f049e939bdf125d9f87ed39abd2690dcf9f
 2013-12-19 13:50:54 -08:00
David Friedman
7cd6cd3178 NDK release notes for r9c for review 
Staged at http://boku.mtv.corp.google.co:9196/tools/sdk/ndk/index.html

Change-Id: Id058d39e10ce64fff2def3dea746ac5e11eff2b4
(cherry picked from commit 51501634c7d530d691f4345990a2434a00603ba2)
 2013-12-19 21:47:46 +00:00
Alan Viverette
ce32ea7345 Add APIs and implementation for additional caption edge types 
Change-Id: I62d97a0b3e3b751d698a889eec80dc79fb908d7a
 2013-12-19 13:42:28 -08:00
RoboErik
8d9802d98e Merge "b/12068020 Add a way to add uniqueness to device descriptors" 2013-12-19 21:15:17 +00: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
Craig Mautner
40432bdf15 Merge "Restore parameter lost in merge." 2013-12-19 21:07:47 +00:00
Craig Mautner
7426684948 Restore parameter lost in merge. 
Fixes build.

Change-Id: I40489334ca5dc10d0041b78a82535c41e13def11
 2013-12-19 13:02:30 -08:00
Michael Wright
f072be84ae Merge "Add Rhodi kl file" 2013-12-19 20:21:47 +00:00
RoboErik
319107bf4f b/12068020 Add a way to add uniqueness to device descriptors 
This adds an integer to the descriptor of devices without uniqely
identifying information. It will reuse values that are no longer
in use, so if you remove a single device and attach a different
identical device it will appear to be the same device.

TODO: Derive uniqueness from USB port when possible. This version
will generate different descriptors for each half of a USB keyboard
that shows up twice.

Change-Id: Id05d5265e21b10cbb4ae3e30f91a89a6b0e55d63
 2013-12-19 11:50:42 -08:00
Craig Mautner
139d2e185a Merge changes Ibbac3f6e,I33c6b4e1 
* changes:
  resolved conflicts for merge of b7bba718 to master
  DO NOT MERGE: Eliminate StackBox.
 2013-12-19 18:57:27 +00:00
Craig Mautner
ff288f7f57 resolved conflicts for merge of b7bba718 to master 
Change-Id: Ibbac3f6e3eda0149ae9446d6baed1d1bee5138ac
 2013-12-19 10:55:17 -08:00
Yorke Lee
710de6dc03 Merge "PhoneNumberUtils API changes" 2013-12-19 18:51:49 +00:00
Craig Mautner
ed6649f89f DO NOT MERGE: Eliminate StackBox. 
StackBox is too constraining. Adding size and position to TaskStacks
directly makes stack positioning and management more flexible and
prepares for ActivityView.

Change-Id: I33c6b4e1c23a5a8069fd507c160bcb34e4d287b2
 2013-12-19 10:51:23 -08:00
Craig Mautner
b7bba718a8 Merge "Pair ActivityStacks with Displays" into klp-modular-dev 2013-12-19 18:29:50 +00:00
Craig Mautner
8a4c62e3fa am b905a37c: am 46f618a7: am a8dfd5d8: am 4dcf1af3: am cccf2a33: Merge "Keydispatching timeout while finish Activity" 
* commit 'b905a37c7a18e8ad98497dea5ab7bd016e3c995d':
  Keydispatching timeout while finish Activity
 2013-12-19 18:03:58 +00:00
Craig Mautner
b905a37c7a am 46f618a7: am a8dfd5d8: am 4dcf1af3: am cccf2a33: Merge "Keydispatching timeout while finish Activity" 
* commit '46f618a7d9dde8e668666e0c582d88ddfea759d9':
  Keydispatching timeout while finish Activity
 2013-12-19 18:00:40 +00:00
Craig Mautner
46f618a7d9 am a8dfd5d8: am 4dcf1af3: am cccf2a33: Merge "Keydispatching timeout while finish Activity" 
* commit 'a8dfd5d896b71faf87b03d27df6050284765fb21':
  Keydispatching timeout while finish Activity
 2013-12-19 17:58:08 +00:00
Craig Mautner
a8dfd5d896 am 4dcf1af3: am cccf2a33: Merge "Keydispatching timeout while finish Activity" 
* commit '4dcf1af3ed8dfa546e6cbf5ecfa66914a3fda883':
  Keydispatching timeout while finish Activity
 2013-12-19 09:55:33 -08:00
Craig Mautner
4dcf1af3ed am cccf2a33: Merge "Keydispatching timeout while finish Activity" 
* commit 'cccf2a333793badbcea9b04fe3f29447496a56d9':
  Keydispatching timeout while finish Activity
 2013-12-19 09:52:32 -08:00
Craig Mautner
cccf2a3337 Merge "Keydispatching timeout while finish Activity" 2013-12-19 17:48:58 +00:00
Narayan Kamath
8907644bb6 am ad1ff472: am 7bbc79fd: am 91f6aaaf: am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int." 
* commit 'ad1ff47213e1b3a34a2b9e5a189742e9a15ed486':
  MediaDrm#mNativeContext is a long, not int.
 2013-12-19 13:14:17 +00:00
Narayan Kamath
ad1ff47213 am 7bbc79fd: am 91f6aaaf: am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int." 
* commit '7bbc79fd68ea358891ef7e7fa758c009491c4ea0':
  MediaDrm#mNativeContext is a long, not int.
 2013-12-19 13:10:40 +00:00
Narayan Kamath
7bbc79fd68 am 91f6aaaf: am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int." 
* commit '91f6aaaf2cb1c1a0cec129cec8038332de0271a8':
  MediaDrm#mNativeContext is a long, not int.
 2013-12-19 13:04:19 +00:00
Narayan Kamath
91f6aaaf2c am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int." 
* commit '2d2d594308693af79bf5c44f0dcc30f29d2dc31a':
  MediaDrm#mNativeContext is a long, not int.
 2013-12-19 05:01:34 -08:00
Narayan Kamath
2d2d594308 am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int." 
* commit 'f3172c623e4bb77a047262c6e7eedc4a2c2ea95a':
  MediaDrm#mNativeContext is a long, not int.
 2013-12-19 04:37:52 -08:00
Narayan Kamath
f3172c623e Merge "MediaDrm#mNativeContext is a long, not int." 2013-12-19 12:35:24 +00:00
Martin Wallgren
c8733b818d Keydispatching timeout while finish Activity 
If there is input to be handled during finish activity we can get a
keydispatching timeout ANR. The reason is that finish activity is some
times not possible, and the activity is instead put on a finish queue.
The activity will then be finished sometime in the future. When we add
the activity to the finish queue, key dispatching is paused, and there
is an ANR timer waiting for it to be resumed again. Since it can take a
long time before the activity is actually finished, we need to resume
the key dispatching to avoid the ANR.

Change-Id: Icea4ab3b5ad05c8bfbadf8f5cece1a59ec621469
 2013-12-19 13:24:00 +01:00
Brian Carlstrom
69d251383f Track Looper decoupling from ALooper 
Change-Id: I83d1f5f6600019268c53706b7bf6d94b84931e18
 2013-12-19 00:25:07 -08:00
Brian Carlstrom
0c2a8c7f27 am 67fa194e: am ee767548: am d9386812: am f64a30f8: am a11371f4: Merge "Track Looper decoupling from ALooper" 
* commit '67fa194ecb9e1d28ae3c60110bef671a3312b13b':
  Track Looper decoupling from ALooper
 2013-12-19 07:58:25 +00:00
Brian Carlstrom
67fa194ecb am ee767548: am d9386812: am f64a30f8: am a11371f4: Merge "Track Looper decoupling from ALooper" 
* commit 'ee767548ba2b4d70e7c7bdc6c56dc0c6634e85d3':
  Track Looper decoupling from ALooper
 2013-12-19 07:27:24 +00:00
Brian Carlstrom
ee767548ba am d9386812: am f64a30f8: am a11371f4: Merge "Track Looper decoupling from ALooper" 
* commit 'd9386812169dd84a7f2bdd3a38a57b9c860525db':
  Track Looper decoupling from ALooper
 2013-12-19 07:25:23 +00:00
Brian Carlstrom
d938681216 am f64a30f8: am a11371f4: Merge "Track Looper decoupling from ALooper" 
* commit 'f64a30f8a68fbd6ee4f7ae2f66267e23f04c5839':
  Track Looper decoupling from ALooper
 2013-12-18 23:21:50 -08:00
Brian Carlstrom
f64a30f8a6 am a11371f4: Merge "Track Looper decoupling from ALooper" 
* commit 'a11371f42b4dd793a48faa3323be34bca0f6d2e6':
  Track Looper decoupling from ALooper
 2013-12-18 23:16:17 -08:00
Brian Carlstrom
a11371f42b Merge "Track Looper decoupling from ALooper" 2013-12-19 07:13:02 +00:00
Baligh Uddin
0c0c0e4a26 am 48b5f4b1: (-s ours) am 73a2208d: (-s ours) am b158819d: (-s ours) am 2e371ee1: (-s ours) am c5b19fd3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '48b5f4b17677c60f6a2ff75bcc50a56182371b07':
  Import translations. DO NOT MERGE
 2013-12-19 05:57:30 +00:00