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

159513 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rubin Xu
40603baa3e am 735f2285: Merge "Remove permission check in DevicePolicyManager.isUninstallBlocked()" into lmp-mr1-dev 
* commit '735f22850edcb5c2447c37cb96f048de8a742907':
  Remove permission check in DevicePolicyManager.isUninstallBlocked()
 2014-11-19 00:09:43 +00:00
Rubin Xu
0122db0a63 am 3a7d3fc6: Merge "Fix equality test in getProfileOwnerAdmin()" into lmp-mr1-dev 
* commit '3a7d3fc60e1347ff9bdddb8040237e2818d67a0e':
  Fix equality test in getProfileOwnerAdmin()
 2014-11-19 00:09:38 +00:00
Chris Craik
df57b22bc6 am 0455174d: Merge "Update clipToPadding docs" into lmp-mr1-dev 
* commit '0455174d347bf451e830584bc3f6f35c3c560282':
  Update clipToPadding docs
 2014-11-19 00:09:32 +00:00
Ricardo Cervera
de71dd5cb4 am 92ad1d81: am b2a2d2c2: am e9fddfd8: am 0d18b091: Merge "docs: Add link to "Voice search in your app" video." into lmp-docs 
* commit '92ad1d8107e66274f226e9e3159283bb8fe3765a':
  docs: Add link to "Voice search in your app" video.
 2014-11-19 00:09:27 +00:00
Rubin Xu
735f22850e Merge "Remove permission check in DevicePolicyManager.isUninstallBlocked()" into lmp-mr1-dev 2014-11-18 23:43:17 +00:00
Rubin Xu
3a7d3fc60e Merge "Fix equality test in getProfileOwnerAdmin()" into lmp-mr1-dev 2014-11-18 23:42:21 +00:00
Chris Craik
0455174d34 Merge "Update clipToPadding docs" into lmp-mr1-dev 2014-11-18 23:33:30 +00:00
Ricardo Cervera
92ad1d8107 am b2a2d2c2: am e9fddfd8: am 0d18b091: Merge "docs: Add link to "Voice search in your app" video." into lmp-docs 
* commit 'b2a2d2c2fe4a8c4794d3025bc10c00404bf79cd8':
  docs: Add link to "Voice search in your app" video.
 2014-11-18 23:31:27 +00:00
Ricardo Cervera
b2a2d2c2fe am e9fddfd8: am 0d18b091: Merge "docs: Add link to "Voice search in your app" video." into lmp-docs 
* commit 'e9fddfd802f9d00dd2d86bd78e3da3cc2f530d3c':
  docs: Add link to "Voice search in your app" video.
 2014-11-18 23:26:41 +00:00
Ricardo Cervera
e9fddfd802 am 0d18b091: Merge "docs: Add link to "Voice search in your app" video." into lmp-docs 
* commit '0d18b091eb5bb5be6f7142821b674e1648158a11':
  docs: Add link to "Voice search in your app" video.
 2014-11-18 23:21:29 +00:00
Ricardo Cervera
0d18b091eb Merge "docs: Add link to "Voice search in your app" video." into lmp-docs 2014-11-18 23:16:22 +00:00
Andreas Gampe
f1c84568bc am 2a20f425: Merge "Frameworks/base: Compiled-classes support" into lmp-mr1-dev 
* commit '2a20f425580b48ec5c130e77eb2a447731e37381':
  Frameworks/base: Compiled-classes support
 2014-11-18 22:52:25 +00:00
Andreas Gampe
2a20f42558 Merge "Frameworks/base: Compiled-classes support" into lmp-mr1-dev 2014-11-18 22:45:50 +00:00
Marco Nelissen
0acbed256e am 6104fb28: Merge "Use stream type if set by user" into lmp-mr1-dev 
* commit '6104fb2862e591fcd62660f5cd11ab5ca48adebb':
  Use stream type if set by user
 2014-11-18 22:25:12 +00:00
Quddus Chong
53dc7c56da am 25f20bde: am 09cf0729: am f256d7ac: am 4741fb4b: docs: Fixed bugs for Auto docs. 
* commit '25f20bdeab04c72b4fda405ad1bfbd2ed42ff121':
  docs: Fixed bugs for Auto docs.
 2014-11-18 22:20:53 +00:00
Chris Craik
22e8e8ef57 am bde9ffbd: Merge "Fix missing ellipsis when just one character is truncated" into lmp-mr1-dev 
* commit 'bde9ffbd56cb420b51f11ca05b5225c1953f048d':
  Fix missing ellipsis when just one character is truncated
 2014-11-18 22:20:48 +00:00
Marco Nelissen
6104fb2862 Merge "Use stream type if set by user" into lmp-mr1-dev 2014-11-18 22:20:05 +00:00
Quddus Chong
25f20bdeab am 09cf0729: am f256d7ac: am 4741fb4b: docs: Fixed bugs for Auto docs. 
* commit '09cf0729a3b21e7106918cf3690e881a1860ae8b':
  docs: Fixed bugs for Auto docs.
 2014-11-18 22:17:53 +00:00
Chris Craik
bde9ffbd56 Merge "Fix missing ellipsis when just one character is truncated" into lmp-mr1-dev 2014-11-18 22:17:35 +00:00
Quddus Chong
09cf0729a3 am f256d7ac: am 4741fb4b: docs: Fixed bugs for Auto docs. 
* commit 'f256d7ac189e58a6c21a5a71e5a1dddeab2d576f':
  docs: Fixed bugs for Auto docs.
 2014-11-18 22:13:06 +00:00
Abhijith Shastry
cc472e66ef am 6807e5f0: Merge "Adding more javadocs to Carrier messaging API." into lmp-mr1-dev 
* commit '6807e5f0feac3cfc85e9fe74378b94bc32a141c5':
  Adding more javadocs to Carrier messaging API.
 2014-11-18 22:10:09 +00:00
Quddus Chong
f256d7ac18 am 4741fb4b: docs: Fixed bugs for Auto docs. 
* commit '4741fb4bb146909fc133ae37ea43dbb7f9edbd04':
  docs: Fixed bugs for Auto docs.
 2014-11-18 22:08:10 +00:00
Abhijith Shastry
6807e5f0fe Merge "Adding more javadocs to Carrier messaging API." into lmp-mr1-dev 2014-11-18 22:04:58 +00:00
Alan Viverette
a4733b68c4 am fb11949d: Merge "Don\'t ignore accessibility overlays during visibility computation" into lmp-mr1-dev 
* commit 'fb11949d5bb810b39e34ec707fcddde345c474cd':
  Don't ignore accessibility overlays during visibility computation
 2014-11-18 21:51:31 +00:00
Amit Mahajan
ca1e3e5e83 am 2733ea76: Merge "Telephony: STK CC feature implementation" into lmp-mr1-dev 
* commit '2733ea767b691ada9faabfd41f4175d320053682':
  Telephony: STK CC feature implementation
 2014-11-18 21:51:16 +00:00
Alan Viverette
fb11949d5b Merge "Don't ignore accessibility overlays during visibility computation" into lmp-mr1-dev 2014-11-18 21:48:13 +00:00
Amit Mahajan
2733ea767b Merge "Telephony: STK CC feature implementation" into lmp-mr1-dev 2014-11-18 21:46:51 +00:00
Quddus Chong
4741fb4bb1 docs: Fixed bugs for Auto docs. 
Change-Id: Iba8406a95374e5c621eb607c6bb0a8ad6a892f59
 2014-11-18 13:46:44 -08:00
John Reck
51ce9cacb6 am 37cdc191: Merge "Don\'t invalidate() on setClipBounds" into lmp-mr1-dev 
* commit '37cdc191e380cca8edcc58f116b9b319bea1c140':
  Don't invalidate() on setClipBounds
 2014-11-18 21:46:44 +00:00
John Reck
37cdc191e3 Merge "Don't invalidate() on setClipBounds" into lmp-mr1-dev 2014-11-18 21:41:17 +00:00
John Reck
fcd38813ef am 3cf61d4b: Merge "Fix invalidateOutline" into lmp-mr1-dev 
* commit '3cf61d4b79a22f89b8fb839ef9ee2146fac4e703':
  Fix invalidateOutline
 2014-11-18 21:37:40 +00:00
John Reck
3cf61d4b79 Merge "Fix invalidateOutline" into lmp-mr1-dev 2014-11-18 21:30:48 +00:00
John Reck
decc26df39 am f0f68117: Merge "Trace some interesting events" into lmp-mr1-dev 
* commit 'f0f68117c432edd5aea406e773ec5bd372976eec':
  Trace some interesting events
 2014-11-18 21:29:15 +00:00
John Reck
f0f68117c4 Merge "Trace some interesting events" into lmp-mr1-dev 2014-11-18 21:23:50 +00:00
Preeti Ahuja
d4180cc2d4 Telephony: STK CC feature implementation 
Add strings and constants required for stk cc feature.

Bug: 17646476
Change-Id: I28c5c199f6138c4db2a00d524592667a481db8cd
 2014-11-18 13:01:02 -08:00
Ye Wen
818b239d00 am f984eb42: Merge "Addressing API review issues for SmsManager (2/3)" into lmp-mr1-dev 
* commit 'f984eb42724e66326549d7bf33a7ec1515a7ff3c':
  Addressing API review issues for SmsManager (2/3)
 2014-11-18 20:37:02 +00:00
Ye Wen
f984eb4272 Merge "Addressing API review issues for SmsManager (2/3)" into lmp-mr1-dev 2014-11-18 20:30:29 +00:00
Adrian Roos
e672db2801 am ed097689: Merge "Add animations for the system bar color views" into lmp-mr1-dev 
* commit 'ed0976897a8d8eb1f7bf55ae25aece84b172cbb4':
  Add animations for the system bar color views
 2014-11-18 20:26:14 +00:00
Adrian Roos
ed0976897a Merge "Add animations for the system bar color views" into lmp-mr1-dev 2014-11-18 20:22:27 +00:00
Winson Chung
5c4be30ac0 am 6aa73cf2: Merge "Tweaking animation XMLs and removing dead code. (Bug 17672056, Bug 18415217)" into lmp-mr1-dev 
* commit '6aa73cf2668e1d4b5b7534995dcc8891b4a7a279':
  Tweaking animation XMLs and removing dead code. (Bug 17672056, Bug 18415217)
 2014-11-18 20:15:42 +00:00
Winson Chung
6aa73cf266 Merge "Tweaking animation XMLs and removing dead code. (Bug 17672056, Bug 18415217)" into lmp-mr1-dev 2014-11-18 20:10:05 +00:00
Winson Chung
3565b6f051 am f95a9fe5: Merge "Fixing high cpu usage due to case not falling through to wait logic. (Bug 18390735)" into lmp-mr1-dev 
* commit 'f95a9fe5372c5f8f80b578ad98d66e92a7cc8608':
  Fixing high cpu usage due to case not falling through to wait logic. (Bug 18390735)
 2014-11-18 20:03:26 +00:00
Winson Chung
f95a9fe537 Merge "Fixing high cpu usage due to case not falling through to wait logic. (Bug 18390735)" into lmp-mr1-dev 2014-11-18 19:58:56 +00:00
Andreas Gampe
ca775941f3 Frameworks/base: Compiled-classes support 
Let AndroidRuntime check for /system/etc/compiled-classes and push
it to the runtime for boot image creation.

Bug: 18410571
Change-Id: I2510316381f2661166af24d7e14b013f4e045556
 2014-11-18 11:48:22 -08:00
Sander Alewijnse
0af82f65d3 am 0925db87: Merge "Rename the dont_disable_system_apps constant." into lmp-mr1-dev 
* commit '0925db87150300a679090a41f6eec26aad5c75e5':
  Rename the dont_disable_system_apps constant.
 2014-11-18 19:30:46 +00:00
Marco Nelissen
1c066306c6 Use stream type if set by user 
Bug: 18426086
Change-Id: I0df390ddb850f8e2a02e24296f2a0d39f5718839
 2014-11-18 11:28:28 -08:00
Sander Alewijnse
0925db8715 Merge "Rename the dont_disable_system_apps constant." into lmp-mr1-dev 2014-11-18 19:28:17 +00:00
Bryce Lee
e19872a983 am d4e55bdf: am 8f7b84e0: Merge "Always wake device on power key from non interactive immediately." into lmp-sprout-dev 
* commit 'd4e55bdfc50635903e04934785ed82c39257506c':
  Always wake device on power key from non interactive immediately.
 2014-11-18 19:16:49 +00:00
Bryce Lee
d4e55bdfc5 am 8f7b84e0: Merge "Always wake device on power key from non interactive immediately." into lmp-sprout-dev 
* commit '8f7b84e037e35db9d3b46873bc1adf712b307cbe':
  Always wake device on power key from non interactive immediately.
 2014-11-18 19:12:43 +00:00
Bryce Lee
8f7b84e037 Merge "Always wake device on power key from non interactive immediately." into lmp-sprout-dev 2014-11-18 19:09:11 +00:00