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

132248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
2ffa11e4b7 Start collecting mobile radio activity from the radio. 
Hook in to the new radio API to find out when the radio
is active and use that to track its state in batter stats.
We also still have the data being tracked from the kernel's
emulation, and continue to use that if we don't get data from
the radio.

Currently this monitoring is turned off until some issues
in the radio can be fixed that are providing bad data.

Also add a new API to get estimated drain and charge times.

Change-Id: Ifc4900fabb8f848f9cda361dce698664ea75f175
 2014-04-24 11:21:30 -07:00
Adam Powell
46ca506022 Merge "Nested scrolling!" 2014-04-24 18:20:43 +00:00
Nick Kralevich
8480384986 Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server" 2014-04-24 18:18:02 +00:00
Daniel Leung
49cbafad9b Zygote: enable CAP_BLOCK_SUSPEND capability for system server 
Starting from kernel 3.6, it requires processes to have the capability
CAP_BLOCK_SUSPEND to set/unset wake locks. Adds CAP_BLOCK_SUSPEND
to the list of capabilities for system server, so that PowerManager
can set wake locks.

Change-Id: I3246e6f6e6cb8f0bedb1c0417ed07085ee1f3aaa
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
 2014-04-24 19:12:38 +01:00
ztenghui
690d1efa2f am d2cd53d4: Merge "Shoot the rays to the vertices of the incoming polygon." 
* commit 'd2cd53d4e525d6cd5e5ff261274f4969e2e8f3fd':
  Shoot the rays to the vertices of the incoming polygon.
 2014-04-24 18:08:05 +00:00
ztenghui
d2cd53d4e5 Merge "Shoot the rays to the vertices of the incoming polygon." 2014-04-24 18:03:00 +00:00
Craig Mautner
32f2d94be7 am 5e6e27ed: Merge "Take screenshots of pausing activity" 
* commit '5e6e27edb7d59255d07e2f74dac74e5898cf949b':
  Take screenshots of pausing activity
 2014-04-24 17:50:32 +00:00
Adam Powell
10ba27734e Nested scrolling! 
or, "Excuse me, Egon, you said crossing the streams was bad."

Add API for driving a nested scroll from the most deeply nested
applicable scrolling view. The deepest scrolling view dispatches
high-level scrolling events up to cooperative parent views.

Augment ScrollView to support nested scrolling. Next up, more public
framework scrolling views.

Change-Id: I53b5e207fcdece796e08c8592ddb4496b96f600e
 2014-04-24 10:48:52 -07:00
Craig Mautner
5e6e27edb7 Merge "Take screenshots of pausing activity" 2014-04-24 17:44:42 +00:00
Craig Mautner
f6ead5d62e Take screenshots of pausing activity 
Previous CL to optimize out excessive screenshots (ag/379669) was too
effective and didn't take screenshots when going into an activity
that had attribute Window_windowNoDisplay. Adding in the test for
ActivityRecord.noDisplay allows screenshots for this situation.

Fixes bug 13410507.

Change-Id: Ieafebf44b7d1a3ba18115e762fba113f8d1c0252
 2014-04-24 10:39:36 -07:00
Craig Mautner
6af40da8af am d2cc56eb: resolved conflicts for merge of f8a58208 to master 
* commit 'd2cc56ebb38b0b9e792e81ba9db8148a3a4b72f6':
  Add activity attribute allowEmbedded
 2014-04-24 17:34:10 +00:00
Craig Mautner
d2cc56ebb3 resolved conflicts for merge of f8a58208 to master 
Conflicts:
	core/java/android/content/pm/PackageParser.java
	core/res/res/values/attrs_manifest.xml
	core/res/res/values/public.xml

Change-Id: I747772e9dbc7ee1cf8993e574de4b3215f6833b2
 2014-04-24 10:27:37 -07:00
Alexandra Gherghina
15b3ee80ee am 80021878: Merge "Fix two potential NPEs in DeviceInfo" 
* commit '80021878a840abffafd9c53e70d39ae2eef90841':
  Fix two potential NPEs in DeviceInfo
 2014-04-24 17:16:22 +00:00
ztenghui
589e7b40be Format the xml files for the VectorDrawableTest 
All automatically done by the tool.
No real changes.

Change-Id: I8a98be9441d7cb0b3636c2a850d1e7de9e79394f
 2014-04-24 10:13:07 -07:00
Alexandra Gherghina
80021878a8 Merge "Fix two potential NPEs in DeviceInfo" 2014-04-24 17:11:51 +00:00
Alexandra Gherghina
a4fcb44033 Fix two potential NPEs in DeviceInfo 
Change-Id: Ic4b5b203af25cda9ae65b477c92c1fb5f31ab093
 2014-04-24 17:55:30 +01:00
ztenghui
7940dc57e3 Shoot the rays to the vertices of the incoming polygon. 
bug:13553955

Change-Id: I4825a49e8eaab969c40f2ee4086f7669c9c6fd29
 2014-04-24 09:53:20 -07:00
Jeff Davidson
ee2a1219d3 API tweaks for network score settings. 
Expose "isAppValidScorer" so Settings can call it.

Also rename ACTION_CHANGE_DEFAULT to ACTION_CHANGE_ACTIVE for
consistency with other naming.

Change-Id: I6c2d0099622958f06c2916ca76090e14d5273c86
 2014-04-24 09:33:27 -07:00
Craig Mautner
f8a5820817 am 03981a4c: Merge "Add activity attribute allowEmbedded" into klp-modular-dev 
* commit '03981a4c2e9689197e4d2c916c07ae16207b5276':
  Add activity attribute allowEmbedded
 2014-04-24 16:33:02 +00:00
Craig Mautner
03981a4c2e Merge "Add activity attribute allowEmbedded" into klp-modular-dev 2014-04-24 16:30:14 +00:00
Raph Levien
89d94564ec am 79cb5505: am 07bed492: am e4ee0e31: Merge "Fix bug 14276128 Clipping at bottom of TextView" into klp-modular-dev 
* commit '79cb5505a97a0465fb849dc20dcaf3dd2f608c9f':
  Fix bug 14276128 Clipping at bottom of TextView
 2014-04-24 16:30:14 +00:00
Raph Levien
79cb5505a9 am 07bed492: am e4ee0e31: Merge "Fix bug 14276128 Clipping at bottom of TextView" into klp-modular-dev 
* commit '07bed4921a05e717a4b7f10a25e3830e346426b7':
  Fix bug 14276128 Clipping at bottom of TextView
 2014-04-24 16:25:21 +00:00
Michael Kolb
bbf8a61bcd am 83474f5b: am 0fc5f869: am e597d5f9: Merge "Use rotation to position circular display mask" into klp-modular-dev 
* commit '83474f5b4d870c12d39cef5ae28b7e3fb6d6a765':
  Use rotation to position circular display mask
 2014-04-24 16:22:05 +00:00
Raph Levien
07bed4921a am e4ee0e31: Merge "Fix bug 14276128 Clipping at bottom of TextView" into klp-modular-dev 
* commit 'e4ee0e3193f8e66cabc5352046969041ad4921e5':
  Fix bug 14276128 Clipping at bottom of TextView
 2014-04-24 16:18:08 +00:00
Michael Kolb
83474f5b4d am 0fc5f869: am e597d5f9: Merge "Use rotation to position circular display mask" into klp-modular-dev 
* commit '0fc5f86950f6089eb8b4cbc0bf9684b8be090fa3':
  Use rotation to position circular display mask
 2014-04-24 16:16:59 +00:00
Michael Kolb
0fc5f86950 am e597d5f9: Merge "Use rotation to position circular display mask" into klp-modular-dev 
* commit 'e597d5f9310f760843272c728d6fb1917abf241a':
  Use rotation to position circular display mask
 2014-04-24 16:13:41 +00:00
Raph Levien
e4ee0e3193 Merge "Fix bug 14276128 Clipping at bottom of TextView" into klp-modular-dev 2014-04-24 16:12:54 +00:00
Michael Kolb
e597d5f931 Merge "Use rotation to position circular display mask" into klp-modular-dev 2014-04-24 16:08:21 +00:00
Michael Kolb
8b275ca9d3 Use rotation to position circular display mask 
Bug: 14231785

Change-Id: Ib6d69f3b9c2a638731539f1c1e51b56ad1698adc
 2014-04-24 09:01:19 -07:00
Kenny Guy
1f3086fba5 am 1c299031: Merge "Fix bug with getLauncherActivities ignoring packageName." 
* commit '1c299031982b6145e372aa43a3b8a5c683fad3da':
  Fix bug with getLauncherActivities ignoring packageName.
 2014-04-24 15:53:14 +00:00
Baligh Uddin
ed8956dd80 am 7cb08dd9: (-s ours) am d0af9589: (-s ours) am aed314e8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '7cb08dd95eec0d940495d1c29dafce387c7c9d0e':
  Import translations. DO NOT MERGE
 2014-04-24 15:53:10 +00:00
Craig Mautner
92e06958cc am 6c66d1fd: am 7e28afd9: am 7d2d2272: Merge "Force ActivityView activities to start in new task" into klp-modular-dev 
* commit '6c66d1fd79968ad286d3cb6477e762d7e8bdc5ec':
  Force ActivityView activities to start in new task
 2014-04-24 15:53:07 +00:00
Elliott Hughes
57ee506b15 am f4567f0c: am 56cc5ba7: am 8d47f23e: am dbb0de21: Merge "Fix a typo in an assertion." 
* commit 'f4567f0c50e88261dd897a9933b5d885c1406a45':
  Fix a typo in an assertion.
 2014-04-24 15:53:04 +00:00
Kenny Guy
1c29903198 Merge "Fix bug with getLauncherActivities ignoring packageName." 2014-04-24 15:49:08 +00:00
Baligh Uddin
7cb08dd95e am d0af9589: (-s ours) am aed314e8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'd0af9589ff8971bb02ee764454e3a46b0c2aebaa':
  Import translations. DO NOT MERGE
 2014-04-24 15:43:59 +00:00
Craig Mautner
6c66d1fd79 am 7e28afd9: am 7d2d2272: Merge "Force ActivityView activities to start in new task" into klp-modular-dev 
* commit '7e28afd9568c590c7110f83b252dbb77f165fcb3':
  Force ActivityView activities to start in new task
 2014-04-24 15:43:37 +00:00
Elliott Hughes
f4567f0c50 am 56cc5ba7: am 8d47f23e: am dbb0de21: Merge "Fix a typo in an assertion." 
* commit '56cc5ba79bdf75a73281dc73f13169a409d96c28':
  Fix a typo in an assertion.
 2014-04-24 15:43:24 +00:00
Craig Mautner
75731016e9 Add test for attribute android:allowEmbedded 
Throw a SecurityException if it is not true for an activity launched
using ActivityContainer.startActivity().

Change-Id: Id1d70e630195a49a3eccdc64a0beccc420400332
 2014-04-24 08:42:32 -07:00
Craig Mautner
ffd14a13ce Add activity attribute allowEmbedded 
Activitys without allowEmbedded=true may not be launched in an ActivityView.

Fixes bug 13693121.

Change-Id: I431d554300fc3504ab1bc7d73a58d5dad24f8639
 2014-04-24 08:41:29 -07:00
Alexandra Gherghina
94f24069e2 am e255d739: Merge "Modify getUserProfiles to return only enabled profiles:" 
* commit 'e255d7399f46de4b4e3d94b95b26df3408274394':
  Modify getUserProfiles to return only enabled profiles:
 2014-04-24 15:25:58 +00:00
Alexandra Gherghina
e255d7399f Merge "Modify getUserProfiles to return only enabled profiles:" 2014-04-24 15:22:09 +00:00
John Spurlock
4d692f866f am 10459a54: Merge "Move notification listener management into helper." 
* commit '10459a541171357a18ee897ffcfed0150600fb16':
  Move notification listener management into helper.
 2014-04-24 14:39:07 +00:00
Baligh Uddin
f4fa3e2878 am 6ec0b321: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '6ec0b32173e6eeb643285975489ac95a08f6f315':
  Import translations. DO NOT MERGE
 2014-04-24 14:34:13 +00:00
Baligh Uddin
3c141d5380 am 0dea3a6e: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '0dea3a6eeac31fff541c284bbf74f123ac163cd2':
  Import translations. DO NOT MERGE
 2014-04-24 14:34:10 +00:00
Baligh Uddin
48eff83a5b am b2cb3a25: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit 'b2cb3a25186687abeed573c5105deb5b1b724110':
  Import translations. DO NOT MERGE
 2014-04-24 14:34:07 +00:00
Baligh Uddin
f9bd38d6c2 am 781d1ca2: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '781d1ca2c500b589beb9eaef0221b41b4c6b840b':
  Import translations. DO NOT MERGE
 2014-04-24 14:34:04 +00:00
Baligh Uddin
d0af9589ff am aed314e8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'aed314e8f3e53627518222777c2fe89666bfd643':
  Import translations. DO NOT MERGE
 2014-04-24 14:34:02 +00:00
Baligh Uddin
fa7054672e am 9ea71200: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '9ea712006dce43fbc7c9091b344aba8c11a884f8':
  Import translations. DO NOT MERGE
 2014-04-24 14:34:01 +00:00
John Spurlock
10459a5411 Merge "Move notification listener management into helper." 2014-04-24 14:32:41 +00:00
Baligh Uddin
6ec0b32173 Merge "Import translations. DO NOT MERGE" 2014-04-24 14:28:38 +00:00