Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
fe03b40da4 Adding additional null checks to prevent crash after task stack view callback is reset. (Bug 18376798) 
Change-Id: I46a324b3b6acba6b6519506ff2431d285e3b57f9
 2014-11-17 11:47:09 -08:00
Ye Wen
643d5caf64 Addressing API review issues for SmsManager (2/3) 
b/18356155

Change-Id: I2941284c48db7734f1b056263e4b53790f665a1c
 2014-11-17 11:46:36 -08:00
Jason Monk
29f7a7b0ae SysUI Tests: Make tests not break SysUI 
Now you can run the tests without getting the blank broken sysui.
The tests instrument themselves so they include all of the source
they need to run rather than piggybacking on the sysui process.

A couple of changes were needed for this.  The xml files cannot
reference com.android.systemui, instead they must use res-auto.
The tests can no longer make privileged calls, so some restructuring
to avoid those calls was needed.

Bug: 18222975
Change-Id: I67b794af854f1420583d48960bd6e52ca753b56d
 2014-11-17 14:46:11 -05:00
Geoff Mendal
27b8033175 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-11-17 19:45:13 +00:00
Geoff Mendal
6558805316 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-17 19:44:50 +00:00
Adam Lesinski
06d8b7b8d2 am cd6f00c3: Merge "Implement back-tracking when searching for attributes in XML or resource bag" into lmp-mr1-dev 
* commit 'cd6f00c3a05717862a88b7409d11176ae53fd9a9':
  Implement back-tracking when searching for attributes in XML or resource bag
 2014-11-17 19:43:24 +00:00
Geoff Mendal
c81a3e16e7 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-17 19:43:10 +00:00
Adam Lesinski
cd6f00c3a0 Merge "Implement back-tracking when searching for attributes in XML or resource bag" into lmp-mr1-dev 2014-11-17 19:39:17 +00:00
Eino-Ville Talvala
8d709f3d53 Camera: Add one more requirement to BURST_CAPTURE 
To enable full-AUTO bursts, also need to ensure a fast enough
AE target FPS range is available.

Bug: 18281970
Change-Id: I73f7747dfe16380a2cd277a56a002ecc1279154e
 2014-11-17 11:37:34 -08:00
Dianne Hackborn
55377c989b am 8a297f6d: am 0a3e11fe: am 76919595: Merge "Issue #17551667: Voice interaction service should be disabled..." into lmp-mr1-dev 
* commit '8a297f6d763a55714d64d9865743d259edea110e':
  Issue #17551667: Voice interaction service should be disabled...
 2014-11-17 19:37:30 +00:00
Eino-Ville Talvala
3a5b2b69c9 am 9c26cebc: am 438f54db: am bad677f3: Merge "Camera2: Add BURST_CAPTURE capability flag" into lmp-mr1-dev 
* commit '9c26cebc887c9b5e2211702a25d4c60481899013':
  Camera2: Add BURST_CAPTURE capability flag
 2014-11-17 19:37:25 +00:00
Ying Wang
753eda5b39 Merge "Frameworks/base: AndroidRuntime standalone preloaded-classes" 2014-11-17 19:35:40 +00:00
xinhe
98e25fc377 air plane mode only send to the owner through the quick setting 
It should send to all the uesers as it behaves in setting

Bug:18353278
Change-Id: Ib46a97e30bfba73dd78fab0c8139d6ccb7ad210f
 2014-11-17 11:35:01 -08:00
Ying Wang
d141a9033b Merge "Move preloaded-classes out of framework.jar." 2014-11-17 19:34:47 +00:00
Jim Miller
58b9ee2826 am cd75f59f: Merge "Fix deadlock caused by synchronous setOccluded() method in keyguard" into lmp-mr1-dev 
* commit 'cd75f59f8cdeda95a50155ad0c9f4abd559037ec':
  Fix deadlock caused by synchronous setOccluded() method in keyguard
 2014-11-17 19:34:37 +00:00
Ying Wang
41505b56e0 am e77a9066: am bb637938: am 7f5fbe9e: Merge "Frameworks/base: AndroidRuntime standalone preloaded-classes" into lmp-mr1-dev 
* commit 'e77a906653739c5d0b67bbffa5566956fddd8cc9':
  Frameworks/base: AndroidRuntime standalone preloaded-classes
 2014-11-17 19:32:14 +00:00
Dianne Hackborn
8a297f6d76 am 0a3e11fe: am 76919595: Merge "Issue #17551667: Voice interaction service should be disabled..." into lmp-mr1-dev 
* commit '0a3e11fe428b2d49cecaaf1199ceed36245c1d6f':
  Issue #17551667: Voice interaction service should be disabled...
 2014-11-17 19:31:59 +00:00
Eino-Ville Talvala
9c26cebc88 am 438f54db: am bad677f3: Merge "Camera2: Add BURST_CAPTURE capability flag" into lmp-mr1-dev 
* commit '438f54dbbbcfeac24fcf5eb52bede69ad2fc02a0':
  Camera2: Add BURST_CAPTURE capability flag
 2014-11-17 19:31:50 +00:00
Ying Wang
d0c45355b9 Move preloaded-classes out of framework.jar. 
Instead we install preloaded-classes as a standalone configuration file
/system/etc/preloaded-classes, so we can configure different file per product.

Bug: 18305157
Change-Id: I22f1a1dd44f90268d02532bf18405768523c0b1b
 2014-11-17 11:31:08 -08:00
Wale Ogunwale
58cdb919d1 am 465e9967: Merge "Consolidated processing of package boardcasts in AM service." into lmp-mr1-dev 
* commit '465e996776d916d8d1b62c539142827bd96a42bc':
  Consolidated processing of package boardcasts in AM service.
 2014-11-17 19:30:16 +00:00
Ricardo Cervera-Navarro
af56f97973 am b04c3d62: am bb987493: am 96424f4a: am 5b11c51d: Merge "docs:eclipse-migrate update" into lmp-docs 
* commit 'b04c3d6208c127bd70502b556e6215d22b8d6192':
  docs:eclipse-migrate update
 2014-11-17 19:30:11 +00:00
Jim Miller
cd75f59f8c Merge "Fix deadlock caused by synchronous setOccluded() method in keyguard" into lmp-mr1-dev 2014-11-17 19:29:01 +00:00
Wale Ogunwale
465e996776 Merge "Consolidated processing of package boardcasts in AM service." into lmp-mr1-dev 2014-11-17 19:27:08 +00:00
Jorim Jaggi
dd907b1a94 am 6a388ef8: Merge "Don\'t play hint animation when touching to wake up" into lmp-mr1-dev 
* commit '6a388ef85eed7659cc5175591e4c7bbaa1b448f6':
  Don't play hint animation when touching to wake up
 2014-11-17 19:25:45 +00:00
Jorim Jaggi
477226bb63 am da5a2863: Merge "Always set correct policy visibility" into lmp-mr1-dev 
* commit 'da5a28635af883c330fe57e98e78eff127706ed4':
  Always set correct policy visibility
 2014-11-17 19:25:40 +00:00
Ricardo Cervera-Navarro
b04c3d6208 am bb987493: am 96424f4a: am 5b11c51d: Merge "docs:eclipse-migrate update" into lmp-docs 
* commit 'bb987493d6d858948b294b7b2f15b6ba67e39fd0':
  docs:eclipse-migrate update
 2014-11-17 19:24:30 +00:00
Ying Wang
affbaee9c1 am c2045047: resolved conflicts for merge of 5c7bc931 to lmp-mr1-dev-plus-aosp 
* commit 'c2045047735522f50bc1d2618280bd37306f18d2':
  Move preloaded-classes out of framework.jar.
 2014-11-17 19:24:11 +00:00
Ying Wang
e77a906653 am bb637938: am 7f5fbe9e: Merge "Frameworks/base: AndroidRuntime standalone preloaded-classes" into lmp-mr1-dev 
* commit 'bb637938d476e7927d2eed53255a3be7f5dd2d19':
  Frameworks/base: AndroidRuntime standalone preloaded-classes
 2014-11-17 19:23:25 +00:00
Jorim Jaggi
6a388ef85e Merge "Don't play hint animation when touching to wake up" into lmp-mr1-dev 2014-11-17 19:22:39 +00:00
Stuart Scott
343a88da1b am b19acb99: Merge "Updating Subscription Info Icon" into lmp-mr1-dev 
* commit 'b19acb999353b8c1bce4f5acdc2ac9c29093bf99':
  Updating Subscription Info Icon
 2014-11-17 19:21:12 +00:00
Ricardo Cervera-Navarro
bb987493d6 am 96424f4a: am 5b11c51d: Merge "docs:eclipse-migrate update" into lmp-docs 
* commit '96424f4a43dfe52cb156a19194984ece3eab6699':
  docs:eclipse-migrate update
 2014-11-17 19:20:19 +00:00
Jorim Jaggi
da5a28635a Merge "Always set correct policy visibility" into lmp-mr1-dev 2014-11-17 19:20:13 +00:00
Stuart Scott
b19acb9993 Merge "Updating Subscription Info Icon" into lmp-mr1-dev 2014-11-17 19:16:51 +00:00
Ricardo Cervera-Navarro
96424f4a43 am 5b11c51d: Merge "docs:eclipse-migrate update" into lmp-docs 
* commit '5b11c51d87ad99d0ccad6bf8b3d1bd4f626e5f48':
  docs:eclipse-migrate update
 2014-11-17 19:14:40 +00:00
Stuart Scott
da5be611d8 Updating Subscription Info Icon 
bug: 18356155

Change-Id: I8d944e9b547701d51a9c58709cb9777a07c5227e
 2014-11-17 19:11:40 +00:00
Ricardo Cervera-Navarro
5b11c51d87 Merge "docs:eclipse-migrate update" into lmp-docs 2014-11-17 19:07:04 +00:00
Andreas Gampe
65ff8ee134 Frameworks/base: AndroidRuntime standalone preloaded-classes 
Change AndroidRuntime::startVM to give the new standalone
preloaded-classes file to the runtime for compilation of images.

Bug: 18305157

(cherry picked from commit 995c62d6ab)

Change-Id: I32a13357893222b25fbce60bf2367c23fb36ab22
 2014-11-17 10:57:57 -08:00
Ying Wang
c204504773 resolved conflicts for merge of 5c7bc931 to lmp-mr1-dev-plus-aosp 
Change-Id: Id3130cf4a23f07953e06301fe93f1da54b9ca191
 2014-11-17 10:56:26 -08:00
Geoff Mendal
db7fca54b9 Import translations. DO NOT MERGE 
Change-Id: Idd82327920b27757f3d124092f9d5cf1c36cc938
Auto-generated-cl: translation import
 2014-11-17 10:55:47 -08:00
Geoff Mendal
27b86af514 Import translations. DO NOT MERGE 
Change-Id: Icdcfccda67a6a347e21ba85729eb6ecac01ec144
Auto-generated-cl: translation import
 2014-11-17 10:50:04 -08:00
Dianne Hackborn
0a3e11fe42 am 76919595: Merge "Issue #17551667: Voice interaction service should be disabled..." into lmp-mr1-dev 
* commit '76919595f4dd3b61f132422372ce4350584a1d42':
  Issue #17551667: Voice interaction service should be disabled...
 2014-11-17 18:42:30 +00:00
Geoff Mendal
adaa819bb7 Import translations. DO NOT MERGE 
Change-Id: I31a7c6bc19264abd28b4c6d85e2fd94e6fd8f8ff
Auto-generated-cl: translation import
 2014-11-17 10:41:15 -08:00
Eino-Ville Talvala
438f54dbbb am bad677f3: Merge "Camera2: Add BURST_CAPTURE capability flag" into lmp-mr1-dev 
* commit 'bad677f3c2230612acbabf6c7233d9a3f24a7dc3':
  Camera2: Add BURST_CAPTURE capability flag
 2014-11-17 18:37:02 +00:00
Geoff Mendal
8a88db1bee Merge "Import translations. DO NOT MERGE" 2014-11-17 18:36:23 +00:00
Ying Wang
54781990d6 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2014-11-17 18:34:56 +00:00
Geoff Mendal
ec85c9bb6a Merge "Import translations. DO NOT MERGE" 2014-11-17 18:34:41 +00:00
Marco Nelissen
b5bb02cdef am e7266806: am 52e2b6f7: Merge "Update calls to IInterface::asBinder()" 
* commit 'e726680652ecd235496afeb3207b463e0aa83955':
  Update calls to IInterface::asBinder()
 2014-11-17 18:34:09 +00:00
Dianne Hackborn
76919595f4 Merge "Issue #17551667: Voice interaction service should be disabled..." into lmp-mr1-dev 2014-11-17 18:33:10 +00:00
Geoff Mendal
e64f6b35f2 Import translations. DO NOT MERGE 
Change-Id: I92fdf378ecedb1f4d92c34c2447734f9b1fbda8d
Auto-generated-cl: translation import
 2014-11-17 10:29:00 -08:00
Stuart Wells
7e1435ec3c Added Razer USA, Ltd serval 
Change-Id: I76b7c36068c3d10ab4acb3123550ef115db0d3d2
 2014-11-17 10:28:47 -08:00