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

126258 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
quddusc
3ee70ca452 am 9c1eaeb0: am ff2599f9: am 0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs 
* commit '9c1eaeb0b4f942b2163175c846e1c08ed4b14cbf':
  docs: Added Javadoc for Gcore Jarlsberg release.
 2014-03-22 09:30:42 +00:00
quddusc
5b2e92e37b am 529d47ac: am e9863dbe: Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs 
* commit '529d47ace907c9d961e2c1fb2e4e68ff24833e72':
  docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.
 2014-03-22 04:09:04 +00:00
quddusc
9c1eaeb0b4 am ff2599f9: am 0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs 
* commit 'ff2599f9b2f25179cad9631181216f2d24255901':
  docs: Added Javadoc for Gcore Jarlsberg release.
 2014-03-22 04:08:59 +00:00
John Spurlock
9ae0c8ffba Merge "Add notification category for recommendations." 2014-03-22 01:35:46 +00:00
John Spurlock
0a69c8c4bd Add notification category for recommendations. 
Change-Id: I3718b8273c3f901aee1b2c2cdc4fcdae25fadcad
 2014-03-21 21:33:37 -04:00
Dianne Hackborn
e9c9c44134 Merge "Battery stats: track actually running time" 2014-03-22 00:26:19 +00:00
quddusc
529d47ace9 am e9863dbe: Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs 
* commit 'e9863dbe0665d5ce6dd46d673034a488b7637aff':
  docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.
 2014-03-22 00:01:20 +00:00
quddusc
ff2599f9b2 am 0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs 
* commit '0802b4fb391eecf37626d3d57f5e07eeb32a3185':
  docs: Added Javadoc for Gcore Jarlsberg release.
 2014-03-22 00:01:16 +00:00
quddusc
e9863dbe06 Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs 2014-03-21 23:55:43 +00:00
quddusc
0802b4fb39 Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs 2014-03-21 23:55:34 +00:00
quddusc
e0f1fc8598 docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page. 
Change-Id: Idc5dc716aa92c752b8dcd1967958d9d46521dfa6
 2014-03-21 16:38:25 -07:00
Christopher Tate
18a65ad09d Merge "Cap the size of app-defined permission trees" 2014-03-21 23:32:59 +00:00
George Mount
2c92c9700c Fix null ActivityOptions when starting an Activity in a new Process. 
Bug 13563265

Change-Id: Ie56cd6d55f13dbf68bafb82ab4bd6b27fde60df6
 2014-03-21 16:25:08 -07:00
Dianne Hackborn
a1bd79268b Battery stats: track actually running time 
Use the uptime while creating the battery stats history to
generate a new event indicating when the CPU is actually running.
We can do this in combination with the new event reporting when
the CPU comes awake, looking at the difference between the
uptime and elapsed time at that point to determine when it last
when to sleep.

Also use this information to generate a new set of aggregated
states, the uptime caused by each wake reason.

Finally use new radio down timestamp to adjust the times we
compute for radio use.  Note that this information is not (yet)
being used to adjust how these are recorded in the history.

Change-Id: I723b3b526c8e7d64de0cac9d1193e04132d5a3e4
 2014-03-21 16:14:59 -07:00
George Mount
2ed16ac623 Fix problem on Animator with a start delay. 
Bug 13589060

Change-Id: I05b9421fa141466bdbfe19f1bd5d993fa23982cb
 2014-03-21 16:13:37 -07:00
Winson Chung
e9c77aee60 Merge "Fixing crash with multiple touch pointers" 2014-03-21 23:03:16 +00:00
Selim Cinek
38fc02d4ef am d9e5761a: am 04ea3ca0: am 50ac19e9: am ba126c09: Disable Set Wallpaper button while loading image 
* commit 'd9e5761a4e62d49212ed22e20840ddb4413ae9e0':
  Disable Set Wallpaper button while loading image
 2014-03-21 23:01:24 +00:00
Winson Chung
4c71aefcbd Fixing crash with multiple touch pointers 
- Adding support for force-reloading certain thumbnails (in prep for fix to Bug. 13587139)
- Use withLayer and withEndAction on ViewPropertyAnimator animations
- Ensuring that we close the notifications panel when we toggle recents

Change-Id: Ied2d841de42046fcb09fffb615156b07b4a67136
 2014-03-21 16:00:18 -07:00
Selim Cinek
d9e5761a4e am 04ea3ca0: am 50ac19e9: am ba126c09: Disable Set Wallpaper button while loading image 
* commit '04ea3ca000312f4eccc44347c37c49471081b852':
  Disable Set Wallpaper button while loading image
 2014-03-21 22:52:52 +00:00
Selim Cinek
04ea3ca000 am 50ac19e9: am ba126c09: Disable Set Wallpaper button while loading image 
* commit '50ac19e9b8d3435eab44cacbb62c5081f44df910':
  Disable Set Wallpaper button while loading image
 2014-03-21 22:46:33 +00:00
Selim Cinek
50ac19e9b8 am ba126c09: Disable Set Wallpaper button while loading image 
* commit 'ba126c09a5c00cb0a96da6ece0b4ab4d7ed2d8cb':
  Disable Set Wallpaper button while loading image
 2014-03-21 22:41:07 +00:00
Christopher Tate
c55f9c0442 Cap the size of app-defined permission trees 
Bug 13529742

Change-Id: I46c2ebc39caf4a9eacbffbb35fc386c2a1cedc12
 2014-03-21 15:16:14 -07:00
Selim Cinek
ba126c09a5 Disable Set Wallpaper button while loading image 
Bug: 13534714
Change-Id: I45ff3436de40ea85fb22d776584d9f30f0795898
(cherry picked from commit 0fa6c1b146f7ed1aba335c30878e2c1b2bf2a8f1)
 2014-03-21 22:15:10 +00:00
Matthew Williams
cde7086b90 Merge "Downgrade expedited to normal on reschedule." 2014-03-21 21:59:07 +00:00
Chad Brubaker
51e938041e am 05e4dc96: am 850eb678: am eb3c0d9a: am 1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev 
* commit '05e4dc96fbe47480fcd639ac679683c90ba07484':
  Fix support for simultaneous VPN tuns
 2014-03-21 21:16:46 +00:00
Chad Brubaker
7f623d6b94 am 9506e84b: am c7726147: am 1fce89d9: am de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev 
* commit '9506e84b6f1b8a63abd5c7ecd580548386cc9aae':
  Include the interface for clearDnsInterfaceForUidRange
 2014-03-21 21:16:43 +00:00
Chad Brubaker
05e4dc96fb am 850eb678: am eb3c0d9a: am 1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev 
* commit '850eb678d7356ea60925dc6fa450e213d5cea2d5':
  Fix support for simultaneous VPN tuns
 2014-03-21 21:09:44 +00:00
Chad Brubaker
9506e84b6f am c7726147: am 1fce89d9: am de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev 
* commit 'c77261471432e1577586395dd0a6a481ef7431b5':
  Include the interface for clearDnsInterfaceForUidRange
 2014-03-21 21:09:41 +00:00
Chad Brubaker
850eb678d7 am eb3c0d9a: am 1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev 
* commit 'eb3c0d9ac387bb0aea5b4956daac1403253bc76d':
  Fix support for simultaneous VPN tuns
 2014-03-21 21:02:47 +00:00
Chad Brubaker
c772614714 am 1fce89d9: am de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev 
* commit '1fce89d946760a1bcf3a733f55494f963eab00c2':
  Include the interface for clearDnsInterfaceForUidRange
 2014-03-21 21:02:43 +00:00
Chad Brubaker
eb3c0d9ac3 am 1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev 
* commit '1aad3ad4ec2137c5aa043f96ccc621a4faffeb56':
  Fix support for simultaneous VPN tuns
 2014-03-21 20:56:41 +00:00
Chad Brubaker
1fce89d946 am de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev 
* commit 'de4e7b4947998638e0345ab9a181bf35a8827bef':
  Include the interface for clearDnsInterfaceForUidRange
 2014-03-21 20:56:37 +00:00
Chad Brubaker
1aad3ad4ec Merge "Fix support for simultaneous VPN tuns" into klp-dev 2014-03-21 20:52:14 +00:00
Chad Brubaker
de4e7b4947 Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev 2014-03-21 20:52:05 +00:00
Paul Lawrence
717e0f5db7 Merge "Don't prompt at boot if we already did that when decrypting" 2014-03-21 20:40:46 +00:00
Ricardo Cervera
1575e1a1f5 am 419b17ec: am 1d77a874: am 588300cb: am 2e929658: Merge "docs: Added new sensor types. Bug: 10674725" into klp-docs 
* commit '419b17ec9e8520b8d38b3f8db6d6fe5b0fce1211':
  docs: Added new sensor types. Bug: 10674725
 2014-03-21 20:24:13 +00:00
Jinsuk Kim
a7efb93c1b am a10958f1: am cfba284a: am d73e66cc: Fix broken build 
* commit 'a10958f1c386851dc69a5dae2c32b899b9f29277':
  Fix broken build
 2014-03-21 20:23:45 +00:00
Colin Cross
8a60ded026 Merge "resolved conflicts for merge of a67e34c8 to master" 2014-03-21 20:19:54 +00:00
Ricardo Cervera
419b17ec9e am 1d77a874: am 588300cb: am 2e929658: Merge "docs: Added new sensor types. Bug: 10674725" into klp-docs 
* commit '1d77a8741c8b08c2b911e714c56521483e23bdac':
  docs: Added new sensor types. Bug: 10674725
 2014-03-21 20:18:29 +00:00
Ricardo Cervera
1d77a8741c am 588300cb: am 2e929658: Merge "docs: Added new sensor types. Bug: 10674725" into klp-docs 
* commit '588300cb5211f7217b81683f8a76bdf95c7bfa8d':
  docs: Added new sensor types. Bug: 10674725
 2014-03-21 20:11:48 +00:00
Colin Cross
a42cb8b0e2 resolved conflicts for merge of a67e34c8 to master 
Change-Id: I597525886260884c9b2dfc7945e01eb8138a58c2
 2014-03-21 13:11:02 -07:00
Ricardo Cervera
588300cb52 am 2e929658: Merge "docs: Added new sensor types. Bug: 10674725" into klp-docs 
* commit '2e92965820d61b704e0eb307da70825c46d899d3':
  docs: Added new sensor types. Bug: 10674725
 2014-03-21 20:06:06 +00:00
Ricardo Cervera
2e92965820 Merge "docs: Added new sensor types. Bug: 10674725" into klp-docs 2014-03-21 20:01:31 +00:00
Bo Liu
caf947737d Merge "Convert a attach/detach functor in ViewRootImpl to x64" 2014-03-21 20:00:35 +00:00
John Reck
02e99e272d am ae316643: am aff40e25: am fc603ca6: am abf701e6: Merge "Eliminate mHasAlpha" into klp-dev 
* commit 'ae31664390a95b1a0b80bf7aa246b8413b469ea7':
  Eliminate mHasAlpha
 2014-03-21 19:59:38 +00:00
Adam Cohen
fb40d78c57 Merge "Catch exceptions if Exif is malformed" 2014-03-21 19:55:54 +00:00
Adam Cohen
146af201d3 Merge "Catching security exception when activity destroyed" 2014-03-21 19:54:55 +00:00
John Reck
ae31664390 am aff40e25: am fc603ca6: am abf701e6: Merge "Eliminate mHasAlpha" into klp-dev 
* commit 'aff40e25e8f16c3ecd20376901d7062774850023':
  Eliminate mHasAlpha
 2014-03-21 19:53:17 +00:00
John Spurlock
3daafcd7ba Merge "Annotate framework vibrate calls with stream hints." 2014-03-21 19:51:44 +00:00
John Reck
aff40e25e8 am fc603ca6: am abf701e6: Merge "Eliminate mHasAlpha" into klp-dev 
* commit 'fc603ca6b518777a7e4dc391bc771e5609ab3ab5':
  Eliminate mHasAlpha
 2014-03-21 19:47:22 +00:00