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

119455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
b73417fc10 am c9a7eeba: am 4cb1bc28: Merge "Refresh cast icon assets to improve visual contrast." into klp-dev 
* commit 'c9a7eeba15641da5a5bc8499e813e6c2211506ff':
  Refresh cast icon assets to improve visual contrast.
 2014-03-19 00:31:06 +00:00
Jeff Brown
c9a7eeba15 am 4cb1bc28: Merge "Refresh cast icon assets to improve visual contrast." into klp-dev 
* commit '4cb1bc2877f8562e6d349a6c737a3055ef4eaa29':
  Refresh cast icon assets to improve visual contrast.
 2014-03-19 00:25:41 +00:00
Jeff Brown
4cb1bc2877 Merge "Refresh cast icon assets to improve visual contrast." into klp-dev 2014-03-19 00:19:38 +00:00
Xia Wang
8e3a2d435f am 1b007565: am 9b650702: Merge "Fix state transition verification." into klp-dev 
* commit '1b007565c73097728496f3dbe811a51c879ba89e':
  Fix state transition verification.
 2014-03-18 23:06:32 +00:00
Xia Wang
1b007565c7 am 9b650702: Merge "Fix state transition verification." into klp-dev 
* commit '9b650702113f8a17e09940c3802de71a9fc62ff1':
  Fix state transition verification.
 2014-03-18 22:16:26 +00:00
Xia Wang
9b65070211 Merge "Fix state transition verification." into klp-dev 2014-03-18 22:10:32 +00:00
Adrian Roos
95edbf823b am a4a1c0d4: am ac275cb3: am 1f3186ee: (-s ours) am 67a92975: am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug 
* commit 'a4a1c0d4ee66f85376adbd71800e05b88b60c5b7':
  DO NOT MERGE - Fix keyguard pattern lockout bug
 2014-03-18 22:01:21 +00:00
Jeff Brown
f1e8d36327 Refresh cast icon assets to improve visual contrast. 
Bug: 13473719
Change-Id: Ia82b2bc487a612f24bbe47f7d6e9182e862bcefa
 2014-03-18 14:40:43 -07:00
Adrian Roos
a4a1c0d4ee am ac275cb3: am 1f3186ee: (-s ours) am 67a92975: am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug 
* commit 'ac275cb3d8184e83228899280bb8901e30f3a5f2':
  DO NOT MERGE - Fix keyguard pattern lockout bug
 2014-03-18 21:07:28 +00:00
Adrian Roos
ac275cb3d8 am 1f3186ee: (-s ours) am 67a92975: am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug 
* commit '1f3186ee4505997ef3a235f669313236099308f4':
  DO NOT MERGE - Fix keyguard pattern lockout bug
 2014-03-18 21:03:15 +00:00
Adrian Roos
1f3186ee45 am 67a92975: am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug 
* commit '67a92975ac638db3d51ea4978cf78ee207fcceb7':
  DO NOT MERGE - Fix keyguard pattern lockout bug
 2014-03-18 13:59:28 -07:00
Adrian Roos
67a92975ac am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug 
* commit '88da2bfaacaafebdd2e0fb9542386486b9594871':
  DO NOT MERGE - Fix keyguard pattern lockout bug
 2014-03-18 13:53:17 -07:00
Adrian Roos
88da2bfaac am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug 
* commit 'ed529a5a78ade4833a8fd2ddfaf88d68ca260e6b':
  DO NOT MERGE - Fix keyguard pattern lockout bug
 2014-03-18 13:47:58 -07:00
Adrian Roos
ed529a5a78 am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug 
* commit '500ec9ce4b7856eca480c4c7dca8df1211614102':
  DO NOT MERGE - Fix keyguard pattern lockout bug
 2014-03-18 13:41:20 -07:00
Adrian Roos
500ec9ce4b am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug 
* commit '25fb7133901f6a538d5d365f3c0c1c936e76679d':
  DO NOT MERGE - Fix keyguard pattern lockout bug
 2014-03-18 13:34:05 -07:00
Adrian Roos
25fb713390 am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug 
* commit '0b2f212204bd71700a4a32b87ac2d4c6a0c56feb':
  DO NOT MERGE - Fix keyguard pattern lockout bug
 2014-03-18 13:28:17 -07:00
Adrian Roos
0b2f212204 am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug 
* commit 'd3da8f711ec642322e497a493985bed5c43f597b':
  DO NOT MERGE - Fix keyguard pattern lockout bug
 2014-03-18 13:24:35 -07:00
Adrian Roos
d3da8f711e am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug 
* commit 'ecba937b005b07d72eadfaf93a200e0b14af2980':
  DO NOT MERGE - Fix keyguard pattern lockout bug
 2014-03-18 13:17:12 -07:00
Dianne Hackborn
d906bc14b0 am d1d91eca: am 7cb1dfe6: Merge "Insufficient ProcessRecord cleanup when persistent process is killed" 
* commit 'd1d91eca3e78f2074b110a0e3530aeff6deef6fe':
  Insufficient ProcessRecord cleanup when persistent process is killed
 2014-03-18 18:36:43 +00:00
Dianne Hackborn
d1d91eca3e am 7cb1dfe6: Merge "Insufficient ProcessRecord cleanup when persistent process is killed" 
* commit '7cb1dfe690b2d700ce212712287dfd59c2c8e43f':
  Insufficient ProcessRecord cleanup when persistent process is killed
 2014-03-18 11:31:34 -07:00
Dianne Hackborn
7cb1dfe690 Merge "Insufficient ProcessRecord cleanup when persistent process is killed" 2014-03-18 18:28:16 +00:00
Xia Wang
01f03b50fb Fix state transition verification. 
When there is connectivity state change, the network states could be broadcasted multiple times.
The state transition should consider that.

Bug: 13277256
Change-Id: I3d400900a0e2454f9d198629f1c062cbb15bdcd8
(cherry picked from commit 71aae0b6fd1bb9204b81c2e9447f3544c29579c4)
 2014-03-18 18:23:05 +00:00
Adrian Roos
ecba937b00 DO NOT MERGE - Fix keyguard pattern lockout bug 
(cherry picked from commit 91c9561cbe665f91e1665f30362c409ae180b127)

Bug: 13302967
Change-Id: I35e7319f8767b2320dc11d9bfe8dc034e2a39b28
 2014-03-18 18:33:14 +01:00
Ricardo Cervera
77d48b17f1 am 965e5e85: am ace69017: docs: Reverted ADT 22.6.1 links 
* commit '965e5e8520d040ce7e064db665982eb98c626b2b':
  docs: Reverted ADT 22.6.1 links
 2014-03-18 17:18:03 +00:00
Ricardo Cervera
965e5e8520 am ace69017: docs: Reverted ADT 22.6.1 links 
* commit 'ace69017443eac3101bf5e36f863fd3cf80cce9f':
  docs: Reverted ADT 22.6.1 links
 2014-03-18 17:11:58 +00:00
Ricardo Cervera
ace6901744 docs: Reverted ADT 22.6.1 links 
Change-Id: Ic08cd7df8d50235e6a673f00dda6baa6863c9025
 2014-03-18 10:02:06 -07:00
Scott Main
b413f66632 am f60dd6e2: am 50d7dc99: add ALL of the Android Wear Dev Preview docs to DAC these were built from the klp-cw-preview-release branch. 
* commit 'f60dd6e2d2765b01018da69dc9ee776e50b47431':
  add ALL of the Android Wear Dev Preview docs to DAC these were built from the klp-cw-preview-release branch.
 2014-03-18 12:54:21 +00:00
Scott Main
f60dd6e2d2 am 50d7dc99: add ALL of the Android Wear Dev Preview docs to DAC these were built from the klp-cw-preview-release branch. 
* commit '50d7dc99e507082c81476ea1474de9970589dee5':
  add ALL of the Android Wear Dev Preview docs to DAC these were built from the klp-cw-preview-release branch.
 2014-03-18 12:51:40 +00:00
Scott Main
50d7dc99e5 add ALL of the Android Wear Dev Preview docs to DAC 
these were built from the klp-cw-preview-release branch.

Change-Id: I9beef683528cfe57b4d088fe7adeb1638b89a640
 2014-03-18 05:41:12 -07:00
Scott Main
35e1c1b429 am 60409d80: am 81857ec5: add android wear to the home carousel 
* commit '60409d802e5df6f85f1f91036327a146b48601c1':
  add android wear to the home carousel
 2014-03-18 12:08:58 +00:00
Scott Main
60409d802e am 81857ec5: add android wear to the home carousel 
* commit '81857ec572b133f99cdbcd575774eb5f9be073b0':
  add android wear to the home carousel
 2014-03-18 12:05:40 +00:00
Scott Main
81857ec572 add android wear to the home carousel 
Change-Id: I1dc50100dd50a710a23b08f677121d499c166b3f
 2014-03-18 03:04:40 -07:00
Narayan Kamath
ddcaf0d178 am d2133079: am 7c0dfed5: Merge "Pass int32_t for JNI calls to java Input/Output streams." 
* commit 'd2133079c085cb0879facc8ee72678524d22571a':
  Pass int32_t for JNI calls to java Input/Output streams.
 2014-03-18 09:41:20 +00:00
Narayan Kamath
d2133079c0 am 7c0dfed5: Merge "Pass int32_t for JNI calls to java Input/Output streams." 
* commit '7c0dfed535bd23ce7cce0f8c498a8d6d3f14ff0f':
  Pass int32_t for JNI calls to java Input/Output streams.
 2014-03-18 02:38:24 -07:00
Narayan Kamath
7c0dfed535 Merge "Pass int32_t for JNI calls to java Input/Output streams." 2014-03-18 09:34:43 +00:00
Akira Numata
eff08c4ffe Insufficient ProcessRecord cleanup when persistent process is killed 
When persistent process with Service restarts, ActivityManagerService
does not reset ProcessRecord#hasClientActivites to false
(because ProcessRecord of persistent process is continued using
after killing).

It disturbs updating LRU list in ActivityManagerService, and then,
when new process calls ActivityManagerProxy#publishContentProviders,
SecurityException happens because of no entry in the list.

Bug: 13517358

Change-Id: I46b064f71a4f7025ade1bf117801352a7ab22e6a
 2014-03-18 05:41:30 +00:00
Ricardo Cervera
08795b7744 am f7c3ecc1: am 71a47aa7: Merge "docs: Added release notes for SDK 22.6.1" into klp-docs 
* commit 'f7c3ecc1e14ebe3666822ad23f9da340f731d1b9':
  docs: Added release notes for SDK 22.6.1
 2014-03-17 22:14:33 +00:00
Ricardo Cervera
f7c3ecc1e1 am 71a47aa7: Merge "docs: Added release notes for SDK 22.6.1" into klp-docs 
* commit '71a47aa7f0ea18bc4d10d87a1932c9f19554fb15':
  docs: Added release notes for SDK 22.6.1
 2014-03-17 22:11:12 +00:00
Ricardo Cervera
71a47aa7f0 Merge "docs: Added release notes for SDK 22.6.1" into klp-docs 2014-03-17 22:07:18 +00:00
Ricardo Cervera
e2a40c42be docs: Added release notes for SDK 22.6.1 
Added release notes for SDK 22.6.1.

stage: http://quixote.mtv:8001/tools/sdk/eclipse-adt.html

Patch: Addressed Joe's comments.
Patch: Addressed Joe's comments.
Patch: Addressed Joe's comments.
Patch: Added new release notes info from Raphael.
Patch: Addressed Joe's comments.
Patch: Addressed Joe's comments.

Change-Id: I229c6b366c19d1d119ccd180ead04f7dd044de4e
 2014-03-17 14:42:20 -07:00
Geoff Mendal
8e5359e56e am c3281db2: (-s ours) am 65325236: (-s ours) Import translations. DO NOT MERGE 
* commit 'c3281db2fb874f56d5612b9d3f07bd91067755ac':
  Import translations. DO NOT MERGE
 2014-03-17 16:50:42 +00:00
Geoff Mendal
c3281db2fb am 65325236: (-s ours) Import translations. DO NOT MERGE 
* commit '6532523652cf16d3e498939965defab4bd22c491':
  Import translations. DO NOT MERGE
 2014-03-17 16:46:53 +00:00
Jeff Sharkey
275d14befc am eeb36c5c: am d88d8174: Merge "Null pointer exception in FileRotator.java" 
* commit 'eeb36c5cfc107fe9128490e9e127c2bca2d24e28':
  Null pointer exception in FileRotator.java
 2014-03-17 16:39:06 +00:00
Jeff Sharkey
eeb36c5cfc am d88d8174: Merge "Null pointer exception in FileRotator.java" 
* commit 'd88d817498327462f42e50348239eac59147f310':
  Null pointer exception in FileRotator.java
 2014-03-17 09:36:03 -07:00
Geoff Mendal
6532523652 Import translations. DO NOT MERGE 
Change-Id: I0b2d6484e67628d26f34d3be39b8b11f009151bd
Auto-generated-cl: translation import
 2014-03-17 09:34:19 -07:00
Jeff Sharkey
d88d817498 Merge "Null pointer exception in FileRotator.java" 2014-03-17 16:32:05 +00:00
Ashok Bhat
2bb39d7a43 Pass int32_t for JNI calls to java Input/Output streams. 
Passing size_t is problematic on 64 bit platforms where
it's 8 bytes in size. Conversion to int32_t is safe because
the size argument is always clamped to fCapacity, which is
4 bytes wide.

Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Change-Id: I58558561a4f56451485f1a5fc6cdeda677247071
 2014-03-17 10:13:16 +00:00
Steve Moyer
0f4a5b9af9 am 05d855de: am d93e7b24: Merge "Don\'t attempt to launch disabled activities in smoke test." 
* commit '05d855defe8610854592ddd7baf5644ac6d4da15':
  Don't attempt to launch disabled activities in smoke test.
 2014-03-16 17:31:32 +00:00
Steve Moyer
05d855defe am d93e7b24: Merge "Don\'t attempt to launch disabled activities in smoke test." 
* commit 'd93e7b2424b7ab442065b0d9cecb8b72a9c5c8ed':
  Don't attempt to launch disabled activities in smoke test.
 2014-03-16 10:29:25 -07:00
Steve Moyer
d93e7b2424 Merge "Don't attempt to launch disabled activities in smoke test." 2014-03-16 17:26:43 +00:00