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
Alan Viverette
ea3219ffa9 am 4be155e8: am a489f0b3: Merge "Re-initialize data when changing time picker 24-hour mode" into lmp-mr1-dev 
* commit '4be155e81aae4fe1354ebc5abe9d55c33723fa4f':
  Re-initialize data when changing time picker 24-hour mode
 2014-11-19 02:42:06 +00:00
Alan Viverette
4be155e81a am a489f0b3: Merge "Re-initialize data when changing time picker 24-hour mode" into lmp-mr1-dev 
* commit 'a489f0b3d9007d94ba514bf4ce71ce9957147e33':
  Re-initialize data when changing time picker 24-hour mode
 2014-11-19 02:34:59 +00:00
Alan Viverette
a489f0b3d9 Merge "Re-initialize data when changing time picker 24-hour mode" into lmp-mr1-dev 2014-11-19 02:28:37 +00:00
Alan Viverette
448ff718a0 Re-initialize data when changing time picker 24-hour mode 
BUG: 18381313
Change-Id: Ie1fa9fbbf8edadfda71cf0ad4f1c39395e56ecc7
 2014-11-18 18:28:04 -08:00
Eric Laurent
0b03f9909b AudioService: use FEATURE_LEANBACK instead of FEATURE_TELEVSION. 
Bug: 18271714.
Change-Id: I2fa6f44ef991aec5a980d70f698813468e7540c6
 2014-11-18 18:08:02 -08:00
Amit Mahajan
4fea0923be Adding new setting LTE_SERVICE_FORCED. 
Bug: 18328639
Change-Id: Icbf9d7987d27af34cbe4ee1b4e9df19e139c2fc7
 2014-11-18 17:34:36 -08:00
Andrew Lee
49e213cd7d Add GENERIC_CONFERENCE to phone capabilities. 
This is a temporary capability to recognize CDMA conference calls
so we can show the right strings in the InCallUi. This should be
moved to CallProperties when possible. b/18434985

Bug: 18284408
Change-Id: Ia3e2ff91c8f8a91ff0123df4d3e6a581bdf85895
 2014-11-18 17:26:07 -08:00
xinhe
67def72d05 Add configuration to control converting sms destination number 
Romove hard codes about the SimcardOperatorList and NetworkOperatorList.

Bug: 18081228
Change-Id: I0d96972c6097325634413137bfbdb5a246885276
 2014-11-18 17:09:54 -08:00
Alan Viverette
cb8ed3705c Remove underline and search icon from ActionBar search view 
BUG: 17396265
Change-Id: I751bc79538f1ea412192172035920e59351270f1
 2014-11-18 17:05:35 -08:00
Shishir Agrawal
ab57c29092 Carrierprivileges: Addressing API council suggestions. 
- hasCarrierPrivileges - renamed to getCarrierPrivilegeStatus
- setLine1NumberForDisplay should not be usable by apps that have MODIFY_PHONE_STATE
- setVoiceMailNumber should not be usable by apps that have MODIFY_PHONE_STATE
- setOperatorBrandOverride should not be usable by apps that have MODIFY_PHONE_STATE

Not addressed:
- setGlobalPreferredNetworkType() should not be usable by apps that have MODIFY_PHONE_STATE

The underlying call is needed by system apps (OMADM) too.

Bug: 18356155
Change-Id: Idc6468a0bd0b0c52b9de1d8446f98c90ac0b3238
 2014-11-18 17:05:12 -08:00
Akira Numata
e50bc6fd29 Default icon is shown after uninstalling updated priv-app 
If updated pre-installed app is moved from "/system/app" to
"/system/priv-app" at FOTA, PackageManager does not update its
resource path correctly. This patch fixes it.

Change-Id: Iac793bcb8fd7c5bfbafd1876640b534c6da5dddf
 2014-11-19 09:57:19 +09:00
Jinsuk Kim
05691638ab am d565e033: am 0beb76e1: am 9899b663: Merge "CEC: Use thread-safe version for avr info" into lmp-mr1-dev 
* commit 'd565e0337f149f044c7117935f114c0c1a99d2df':
  CEC: Use thread-safe version for avr info
 2014-11-19 00:42:54 +00:00
Jeff Hao
8af3cfda46 am e5facf35: am a1f5fc08: am 1c49a612: am c6fdda52: (-s ours) Merge "Frameworks/base: Compiled-classes support" into lmp-sprout-dev 
* commit 'e5facf356b3754e3c598a736694b6691b6c78fa2':
  Frameworks/base: Compiled-classes support
 2014-11-19 00:37:24 +00:00
Jinsuk Kim
d565e0337f am 0beb76e1: am 9899b663: Merge "CEC: Use thread-safe version for avr info" into lmp-mr1-dev 
* commit '0beb76e108721a009381a84bde024fc9995eeed9':
  CEC: Use thread-safe version for avr info
 2014-11-19 00:36:27 +00:00
Jeff Hao
e5facf356b am a1f5fc08: am 1c49a612: am c6fdda52: (-s ours) Merge "Frameworks/base: Compiled-classes support" into lmp-sprout-dev 
* commit 'a1f5fc088d2532f020905fbab5a30bd6aac1aea5':
  Frameworks/base: Compiled-classes support
 2014-11-19 00:32:03 +00:00
Jinsuk Kim
0beb76e108 am 9899b663: Merge "CEC: Use thread-safe version for avr info" into lmp-mr1-dev 
* commit '9899b663f4c512e4a9acaa5508f0fd86bed6e476':
  CEC: Use thread-safe version for avr info
 2014-11-19 00:31:59 +00:00
Jinsuk Kim
9899b663f4 Merge "CEC: Use thread-safe version for avr info" into lmp-mr1-dev 2014-11-19 00:25:43 +00:00
Jeff Sharkey
fc162cf37c am 8bbdd1ce: am c5efb2b9: am d6447bbc: Merge "Speed up GrantUri.hashCode()." into lmp-mr1-dev 
* commit '8bbdd1ce481e3a228734d1d27f9985b38a9c0f78':
  Speed up GrantUri.hashCode().
 2014-11-19 00:24:29 +00:00
Andreas Gampe
668e3b44b8 am 2cabf4a9: Merge branch \'lmp-mr1-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp 
* commit '2cabf4a93df38569e8fd70ac6c848e9e96113116':
  PopupWindow: fix typo in doc comment
 2014-11-19 00:24:23 +00:00
Christopher Tate
e9e3c476d5 am 1f284855: am f066bf22: am 04eb368d: Merge "Prevent some alarm pathologies" into lmp-mr1-dev 
* commit '1f284855fc9abffc64b80ddd5b0864e4d25f0df7':
  Prevent some alarm pathologies
 2014-11-19 00:24:18 +00:00
Rubin Xu
4221126b95 am 3c1d5e2f: am 40603baa: am 735f2285: Merge "Remove permission check in DevicePolicyManager.isUninstallBlocked()" into lmp-mr1-dev 
* commit '3c1d5e2f9d0724f0a10313244d0ef47957d855f2':
  Remove permission check in DevicePolicyManager.isUninstallBlocked()
 2014-11-19 00:24:13 +00:00
Rubin Xu
dbf32fe93a am f978e667: am 0122db0a: am 3a7d3fc6: Merge "Fix equality test in getProfileOwnerAdmin()" into lmp-mr1-dev 
* commit 'f978e667a6395902be09f3dd6c5c6b8d17ce58da':
  Fix equality test in getProfileOwnerAdmin()
 2014-11-19 00:24:09 +00:00
Chris Craik
22da9ba481 am 51888ef8: am df57b22b: am 0455174d: Merge "Update clipToPadding docs" into lmp-mr1-dev 
* commit '51888ef85d1350217297cb704dac80d45a1845e9':
  Update clipToPadding docs
 2014-11-19 00:24:04 +00:00
Ricardo Cervera
86bec96334 am 23dac82d: am de71dd5c: am 92ad1d81: am b2a2d2c2: am e9fddfd8: am 0d18b091: Merge "docs: Add link to "Voice search in your app" video." into lmp-docs 
* commit '23dac82dd3ec235d1c38ec8ba4871ac68dda24b4':
  docs: Add link to "Voice search in your app" video.
 2014-11-19 00:23:59 +00:00
Jeff Hao
a1f5fc088d am 1c49a612: am c6fdda52: (-s ours) Merge "Frameworks/base: Compiled-classes support" into lmp-sprout-dev 
* commit '1c49a6124b1bcada842cf46caf331f81717376bc':
  Frameworks/base: Compiled-classes support
 2014-11-19 00:23:05 +00:00
Jeff Sharkey
8bbdd1ce48 am c5efb2b9: am d6447bbc: Merge "Speed up GrantUri.hashCode()." into lmp-mr1-dev 
* commit 'c5efb2b92a2901f71ebcab039fec24b6dd0ab927':
  Speed up GrantUri.hashCode().
 2014-11-19 00:20:50 +00:00
Andreas Gampe
2cabf4a93d Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp 2014-11-19 00:20:49 +00:00
Christopher Tate
1f284855fc am f066bf22: am 04eb368d: Merge "Prevent some alarm pathologies" into lmp-mr1-dev 
* commit 'f066bf229cd28210af476a7a02b6901e0bd9e829':
  Prevent some alarm pathologies
 2014-11-19 00:19:56 +00:00
Rubin Xu
3c1d5e2f9d am 40603baa: am 735f2285: Merge "Remove permission check in DevicePolicyManager.isUninstallBlocked()" into lmp-mr1-dev 
* commit '40603baa3ec570b1cb423e3488125b1dd35cb5e9':
  Remove permission check in DevicePolicyManager.isUninstallBlocked()
 2014-11-19 00:19:50 +00:00
Rubin Xu
f978e667a6 am 0122db0a: am 3a7d3fc6: Merge "Fix equality test in getProfileOwnerAdmin()" into lmp-mr1-dev 
* commit '0122db0a6397f5bd08042e1a5919114e3cccb9f4':
  Fix equality test in getProfileOwnerAdmin()
 2014-11-19 00:19:43 +00:00
Chris Craik
51888ef85d am df57b22b: am 0455174d: Merge "Update clipToPadding docs" into lmp-mr1-dev 
* commit 'df57b22bc679664138079a4f15966b19f63f0aea':
  Update clipToPadding docs
 2014-11-19 00:19:34 +00:00
Ricardo Cervera
23dac82dd3 am de71dd5c: am 92ad1d81: am b2a2d2c2: am e9fddfd8: am 0d18b091: Merge "docs: Add link to "Voice search in your app" video." into lmp-docs 
* commit 'de71dd5cb47509011099f08ae872de5f2c945775':
  docs: Add link to "Voice search in your app" video.
 2014-11-19 00:19:28 +00:00
Jeff Hao
1c49a6124b am c6fdda52: (-s ours) Merge "Frameworks/base: Compiled-classes support" into lmp-sprout-dev 
* commit 'c6fdda5284b27ca2ad8f0dc8f359f0bbc69db33d':
  Frameworks/base: Compiled-classes support
 2014-11-19 00:17:12 +00:00
Jeff Sharkey
c5efb2b92a am d6447bbc: Merge "Speed up GrantUri.hashCode()." into lmp-mr1-dev 
* commit 'd6447bbc88b8c1c238dd8e5bfb4b0daf6d2266cb':
  Speed up GrantUri.hashCode().
 2014-11-19 00:14:51 +00:00
Andreas Gampe
9c7f8dc143 am f1b5abee: am 12c172a8: Merge "Frameworks/base: Compiled-classes support" 
* commit 'f1b5abee927903f90645d59a5b075103e7306524':
  Frameworks/base: Compiled-classes support
 2014-11-19 00:14:38 +00:00
Andreas Gampe
08cbcbb461 am 2e706eb5: am f1c84568: am 2a20f425: Merge "Frameworks/base: Compiled-classes support" into lmp-mr1-dev 
* commit '2e706eb5b7154044d1a22ed03738bba16867f745':
  Frameworks/base: Compiled-classes support
 2014-11-19 00:14:32 +00:00
Andreas Gampe
04b81ac040 am 01dbe739: am 8462913d: Merge "Frameworks/base: Ignore unknown pragmas in core/jni" 
* commit '01dbe7397642836107c2189e36e7387e354081fd':
  Frameworks/base: Ignore unknown pragmas in core/jni
 2014-11-19 00:14:26 +00:00
Marco Nelissen
d99e62c5a0 am 7f8040a8: am 0acbed25: am 6104fb28: Merge "Use stream type if set by user" into lmp-mr1-dev 
* commit '7f8040a80472b86c358f4b28ca7ec938d7fbed00':
  Use stream type if set by user
 2014-11-19 00:14:09 +00:00
Quddus Chong
2a3f6a7b11 am 86b76998: am 53dc7c56: am 25f20bde: am 09cf0729: am f256d7ac: am 4741fb4b: docs: Fixed bugs for Auto docs. 
* commit '86b7699875992c3cc442c0ffa37ed990080b221e':
  docs: Fixed bugs for Auto docs.
 2014-11-19 00:14:03 +00:00
Chris Craik
a19f77ce8d am de81cf0c: (-s ours) am 22e8e8ef: am bde9ffbd: Merge "Fix missing ellipsis when just one character is truncated" into lmp-mr1-dev 
* commit 'de81cf0c314e797b35135547534692593ab25fce':
  Fix missing ellipsis when just one character is truncated
 2014-11-19 00:13:59 +00:00
Adam Powell
3df1a1da42 resolved conflicts for merge of d8435643 to lmp-mr1-dev-plus-aosp 
Change-Id: Ic4669691dd50e400d79e1bc1e54d2e53bcd35a56
 2014-11-18 16:12:28 -08:00
Jinsuk Kim
86a1e5a16e CEC: Use thread-safe version for avr info 
getSystemAudioMode() should have used the thread-safe method
to get the information of the connected AVR.

Bug: 18426137

Change-Id: Ib3edff97337b5960160dd39d551fbfbbfdfce93b
 2014-11-19 09:12:21 +09:00
Jeff Sharkey
d6447bbc88 Merge "Speed up GrantUri.hashCode()." into lmp-mr1-dev 2014-11-19 00:09:51 +00:00
Christopher Tate
f066bf229c am 04eb368d: Merge "Prevent some alarm pathologies" into lmp-mr1-dev 
* commit '04eb368d0381b0f94365b4e270afb610fe3564c2':
  Prevent some alarm pathologies
 2014-11-19 00:09:50 +00:00
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
Jeff Hao
c6fdda5284 Merge "Frameworks/base: Compiled-classes support" into lmp-sprout-dev 2014-11-18 23:56:33 +00:00
Christopher Tate
04eb368d03 Merge "Prevent some alarm pathologies" into lmp-mr1-dev 2014-11-18 23:49:54 +00:00