42282 Commits

Author SHA1 Message Date
Elliott Hughes
e16a21c6b4 resolved conflicts for merge of 4a59376d to stage-aosp-master
Change-Id: I0e40180b46dc58781c218b8d382299dab73d49cc
2013-07-09 15:25:23 -07:00
Craig Mautner
5eda9b3301 Add convertToTranslucent to API.
Rename convertToOpaque to convertFromTranslucent. Add the
counterpart to Activity.convertFromTranslucent() for returning from
opaque to a translucent Activity. The caller should wait until
TranslucentConversionListener.onTranslucentConversionComplete() is
called before actually changing the background to translucent.

Change-Id: Id04b026bcc4dd8bad9a33a7af126e1bb28fb9c03
2013-07-09 14:50:12 -07:00
Elliott Hughes
befd0b1bdf Track libcore API change.
Change-Id: Ib818a7f21325c5f918bf497033a90d76b25ec9e7
2013-07-09 14:46:18 -07:00
Chad Brubaker
f11e5d3476 Permissions to protect socket marking settings
Add the manifest entries for the net_mark group that protects marking
traffic as from another user in per user routing.

Change-Id: I97932a9e407467a7adc733caea8746a712bc6b68
2013-07-09 13:48:21 -07:00
Craig Mautner
607c6e2a56 Merge "Refactor ActivityThread cache - Baby step 1." 2013-07-09 20:25:16 +00:00
Craig Mautner
88c0589969 Refactor ActivityThread cache - Baby step 1.
Introduce ResourcesManager and ResourcesKey as standalone classes.
Move DisplayMetrics and Resources HashMaps from ActivityThread to
ResourcesManager.

Change-Id: I20cc6c0dd1b74667354839e5ac9a660f4ee2d00d
2013-07-09 09:36:42 -07:00
Satoshi Kataoka
42e230cdb4 Merge "Consolidate InputMethodUtils" 2013-07-09 14:42:18 +00:00
Satoshi Kataoka
b282726d86 Consolidate InputMethodUtils
Change-Id: Ib5a5f3af8ea9eaaa81697d13c20abe28121e7373
2013-07-09 23:20:06 +09:00
Dianne Hackborn
a4cc205ee8 More procstats work.
The historical data is now a more central part of the stats.
When a checkin happens, the data is not deleted, just marked
as checked in so we can continue to access it.

The default procstats dump is now a new "summary" mode that
shows a more useful set of data for all of the running processes.
By default the current and all committed states are shown; you
use "--current" to only show the current.  Use "--details" to
get the previous more detailed data (which now includes detailed
process data like the per-package data).

Also tweaked uid printing to be a little more compact.

Change-Id: I5414ea7c07134ebd5dc83f6f7b9f6e30151eda85
2013-07-08 18:06:24 -07:00
Mathias Agopian
d19db9a7c4 Merge "be more robust with handling unknown sensors" 2013-07-08 22:48:37 +00:00
Mathias Agopian
b25c0efad2 be more robust with handling unknown sensors
- add support for new sensors (post 4.3)
- don't crash when encountering an unknown sensor type
- clean-up

Bug: 9683153
Change-Id: Iecd883e8a7d0297be1bd2bd4f00c5cc3ffcbccfe
2013-07-08 15:24:09 -07:00
Jean-Baptiste Queru
414b02380d resolved conflicts for merge of 9058a6c8 to master
Change-Id: I361773dac17a551dd7b4c0b0e4e649ddf7612d90
2013-07-08 15:02:41 -07:00
Jean-Baptiste Queru
a2bbb9a7d1 am 6cd4281d: am 65ba6d11: am 1e7276ce: Merge "Fix typo in AlertController.java"
* commit '6cd4281dae6c1de0196f79c6c155f75602de64f6':
  Fix typo in AlertController.java
2013-07-08 14:48:04 -07:00
Jean-Baptiste Queru
9058a6c881 am 7e683ec6: am fa42e774: Merge "FastScroller: Fix to use appropriate index"
* commit '7e683ec6a53b1581671ce72782e7b25a0ae705d0':
  FastScroller: Fix to use appropriate index
2013-07-08 14:43:01 -07:00
Jean-Baptiste Queru
6cd4281dae am 65ba6d11: am 1e7276ce: Merge "Fix typo in AlertController.java"
* commit '65ba6d11e1f3ecf33a5b6e68ab8a6322e993b4d8':
  Fix typo in AlertController.java
2013-07-08 14:42:56 -07:00
Jean-Baptiste Queru
7e683ec6a5 am fa42e774: Merge "FastScroller: Fix to use appropriate index"
* commit 'fa42e774bc48c3172023c8c49610baa469c19e39':
  FastScroller: Fix to use appropriate index
2013-07-08 14:28:45 -07:00
Jean-Baptiste Queru
65ba6d11e1 am 1e7276ce: Merge "Fix typo in AlertController.java"
* commit '1e7276ce35f68c2df10b52c8adf8adc2882b8671':
  Fix typo in AlertController.java
2013-07-08 14:25:06 -07:00
Jean-Baptiste Queru
fa42e774bc Merge "FastScroller: Fix to use appropriate index" 2013-07-08 21:24:06 +00:00
Jean-Baptiste Queru
1e7276ce35 Merge "Fix typo in AlertController.java" 2013-07-08 21:22:18 +00:00
Kenny Root
242f1f3fc6 Merge "KeySetManager: fix indentation" 2013-07-08 19:48:41 +00:00
Jean-Baptiste Queru
bb4991e6eb am db550fc9: am 0e545bf5: am 9775203b: Merge "SectionIndexer: Update Javadoc for ExpandableListAdapters"
* commit 'db550fc900eaf3a5a845dcd0c0bb0ead2b1582d6':
  SectionIndexer: Update Javadoc for ExpandableListAdapters
2013-07-08 12:44:50 -07:00
Jean-Baptiste Queru
db550fc900 am 0e545bf5: am 9775203b: Merge "SectionIndexer: Update Javadoc for ExpandableListAdapters"
* commit '0e545bf5502fde4fe2c96377829bd4c3f7c2d727':
  SectionIndexer: Update Javadoc for ExpandableListAdapters
2013-07-08 12:40:28 -07:00
Jean-Baptiste Queru
0e545bf550 am 9775203b: Merge "SectionIndexer: Update Javadoc for ExpandableListAdapters"
* commit '9775203b610267bf8cecaf7c00db68b73b529ced':
  SectionIndexer: Update Javadoc for ExpandableListAdapters
2013-07-08 12:37:27 -07:00
Jean-Baptiste Queru
9775203b61 Merge "SectionIndexer: Update Javadoc for ExpandableListAdapters" 2013-07-08 19:35:36 +00:00
Chris Craik
5bee57567b Merge "Use global references for Bitmap AndroidPixelRefs" 2013-07-08 19:20:18 +00:00
Chris Craik
0c20c3898a Use global references for Bitmap AndroidPixelRefs
bug:9621717

Because we're no longer holding onto Bitmaps Java side during
DisplayList lifetime, use global refs to keep the backing byte arrays
around.

Adds back bitmap buffer passing + native ref management removed by
3b748a44c6bd2ea05fe16839caf73dbe50bd7ae9

Adds back globalRef-ing removed by
f890fab5a6715548e520a6f010a3bfe7607ce56e

Change-Id: Ia59ba42f05bea6165aec2b800619221a8083d580
2013-07-08 11:08:02 -07:00
Kenny Root
2758e291c8 KeySetManager: fix indentation
Change-Id: I4fe67143bce30a7592c6a0f5a094172112bdfe43
2013-07-08 09:37:24 -07:00
Eric Laurent
7cf06209dc Headphones volume warning disabled by default
Enable headphone volume limitation explicitely for
countries where EN60950 is applicable.

Bug: 8877359.

Change-Id: Ida9e6678ee451350b826492f0085726003f0d39d
2013-07-03 17:59:03 -07:00
msg555
b264f5f83f Mixed delete/delete[].
Error found via valgrind.
2013-07-03 19:26:23 -04:00
Craig Mautner
ba5664ed92 Merge "Remove debug logging." 2013-07-03 20:04:10 +00:00
Baligh Uddin
7368bf9ebf Import translations. DO NOT MERGE
Change-Id: I59059107c587612def1a2e6a8aa07f62cf41d599
Auto-generated-cl: translation import
2013-07-03 11:36:26 -07:00
Baligh Uddin
440df1bbb9 am 505565c3: Import translations. DO NOT MERGE
* commit '505565c3481b59b2856c9b5c42ae19f54fdfcfb1':
  Import translations. DO NOT MERGE
2013-07-03 11:35:02 -07:00
Baligh Uddin
505565c348 Import translations. DO NOT MERGE
Change-Id: I5e1ae1aaa21b272c4731ec6f6f8d70a3c909a35a
Auto-generated-cl: translation import
2013-07-03 11:22:24 -07:00
Baligh Uddin
be432a6983 Import translations. DO NOT MERGE
Change-Id: I3e7dc51b5b326c7269cdb31a02642511d6dbf52b
Auto-generated-cl: translation import
2013-07-03 11:20:22 -07:00
Jean-Baptiste Queru
f5d6e24736 am 51ec7f37: am da52b9a2: am 8113b17c: Merge "Fixed incorrect calculation of dirty invalidation area"
* commit '51ec7f3725877a45b518299f279a68e6f5ea8e59':
  Fixed incorrect calculation of dirty invalidation area
2013-07-02 15:02:17 -07:00
Jean-Baptiste Queru
51ec7f3725 am da52b9a2: am 8113b17c: Merge "Fixed incorrect calculation of dirty invalidation area"
* commit 'da52b9a28756e67daa03654953678dfa08e0ca5d':
  Fixed incorrect calculation of dirty invalidation area
2013-07-02 15:00:01 -07:00
Jean-Baptiste Queru
da52b9a287 am 8113b17c: Merge "Fixed incorrect calculation of dirty invalidation area"
* commit '8113b17c473367bd1be7db707fc5b94121cb09e5':
  Fixed incorrect calculation of dirty invalidation area
2013-07-02 14:58:22 -07:00
Dianne Hackborn
d9fb14a38a Merge "Misc memory stuff." 2013-07-02 18:30:43 +00:00
Dianne Hackborn
2286cdc0ca Misc memory stuff.
- New Activity.reportFullyDrawn() method that applicatins can call
  when they know they are fully drawn, allowing us to have better
  app launch time info.  This data is also included in usage stats.
- Added total and free memory data "dumpsys meminfo".
- Tuned the moderate memory levels to be more aggressive about
  considering the device getting low on RAM, and thus starting
  to prune RAM from processes.
- Fixed issues in processstats when reading old data as well as
  resetting and other various fixes.

Change-Id: I20efe7451afb4edfa1aeec448328ba601c24d869
2013-07-02 11:21:04 -07:00
Oliver Woodman
dae9aa3f37 am 9ad7b946: am 0661dd15: Merge "Expose latency methods through AudioManager and AudioTrack." into jb-mr2-dev
* commit '9ad7b946fe9a5dd706205e90046ddc1bd6cb8ad0':
  Expose latency methods through AudioManager and AudioTrack.
2013-07-02 01:33:56 -07:00
Oliver Woodman
0661dd157f Merge "Expose latency methods through AudioManager and AudioTrack." into jb-mr2-dev 2013-07-02 08:11:14 +00:00
Baligh Uddin
7f48bea96b Merge "Import translations. DO NOT MERGE" 2013-07-02 05:37:13 +00:00
Satoshi Kataoka
1ae9e846f3 Merge "Fix possible NPE in IInputMethodWrapper" 2013-07-02 05:35:10 +00:00
Baligh Uddin
22b41b0c09 am 178807d5: am d6696b7c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '178807d590c1c873bd5eaae4c1cf331549fb6bbf':
  Import translations. DO NOT MERGE
2013-07-01 20:32:18 -07:00
Baligh Uddin
d6696b7c0b Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-07-02 03:28:52 +00:00
Jeff Brown
76c07a5cd0 Merge "Move input library code to frameworks/native." 2013-07-02 03:21:22 +00:00
Jeff Brown
9d3b1a424c Move input library code to frameworks/native.
No longer compile libandroidfw as a static library on the device
since it already exists as a shared library.  Keeping the static
library would force us to provide a static library version of
libinput for the device as well which doesn't make sense.

Change-Id: I3517881b87b47dcc209d80dbd0ac6b5cf29a766f
2013-07-01 20:11:42 -07:00
Wink Saville
9f6a7f424f Merge commit '3b5d686e' into fix-merge-conflict
* commit '3b5d686e':
  Add checkMobileProvisioning to ConnectivityService.

Conflicts:
	services/java/com/android/server/ConnectivityService.java

Change-Id: Ieceb9c8f4aa4fa99258e56a720b4c74512369458
2013-07-01 16:12:31 -07:00
Wink Saville
3b5d686e68 am c45f2e05: am 59046f40: Merge "Add checkMobileProvisioning to ConnectivityService." into jb-mr2-dev
* commit 'c45f2e05e3b9d261009c66346ef2257ec105f05c':
  Add checkMobileProvisioning to ConnectivityService.
2013-07-01 15:41:31 -07:00
Wink Saville
59046f40ba Merge "Add checkMobileProvisioning to ConnectivityService." into jb-mr2-dev 2013-07-01 22:36:48 +00:00