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

174598 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
49a93f520f am 0014addf: (-s ours) am 04b6a6d3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '0014addf883675613648713e7c01b70fb780a5dc':
  Import translations. DO NOT MERGE
 2014-11-19 15:28:42 +00:00
Geoff Mendal
0014addf88 am 04b6a6d3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '04b6a6d3a17e40599d90ccabc6a8481a62dd2ae1':
  Import translations. DO NOT MERGE
 2014-11-19 15:25:23 +00:00
Geoff Mendal
04b6a6d3a1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-19 15:19:34 +00:00
Geoff Mendal
2a42085896 Import translations. DO NOT MERGE 
Change-Id: Ibfc1a6ef7529620c86fb25ac4ae4b27258a810c1
Auto-generated-cl: translation import
 2014-11-19 07:17:01 -08:00
Jason Monk
9da2791f69 am 4854657f: am 90bec300: am 56dd1f1e: Merge "Automatically enable BT when entering BT QS panel" into lmp-mr1-dev 
* commit '4854657f0eaeef4c51b51976561eafd403bc5353':
  Automatically enable BT when entering BT QS panel
 2014-11-19 15:13:27 +00:00
Jason Monk
4854657f0e am 90bec300: am 56dd1f1e: Merge "Automatically enable BT when entering BT QS panel" into lmp-mr1-dev 
* commit '90bec3001294601227c3578377325224b02180cc':
  Automatically enable BT when entering BT QS panel
 2014-11-19 15:07:54 +00:00
Jason Monk
90bec30012 am 56dd1f1e: Merge "Automatically enable BT when entering BT QS panel" into lmp-mr1-dev 
* commit '56dd1f1eb6fdca10ea2f33d8420e6051e14ed435':
  Automatically enable BT when entering BT QS panel
 2014-11-19 15:03:46 +00:00
Jason Monk
56dd1f1eb6 Merge "Automatically enable BT when entering BT QS panel" into lmp-mr1-dev 2014-11-19 14:58:40 +00:00
Narayan Kamath
343f478241 Tell installd when boot completes. 
installd can then clear the ".booting" marker from the dalvik-cache
(owned by root). This marker is used to detect boot loops.

bug: 18280671

(cherry picked from commit 76a748e62f354c799342044f724e1f4b80121837)

Change-Id: I2364c05837ac04d428b5a34ab1802964a11d2df4
 2014-11-19 14:41:08 +00:00
Geoff Mendal
3bd8304922 Merge "Import translations. DO NOT MERGE" 2014-11-19 14:40:26 +00:00
Geoff Mendal
3e1f102d48 Import translations. DO NOT MERGE 
Change-Id: Ib9109f2785d00192370803b6f1c577d480bc009b
Auto-generated-cl: translation import
 2014-11-19 06:31:47 -08:00
Geoff Mendal
2081228b82 Import translations. DO NOT MERGE 
Change-Id: Ifac2744b085fd628d2688543243f52e2bec82292
Auto-generated-cl: translation import
 2014-11-19 06:27:10 -08:00
Dongwon Kang
5f3cb4a584 TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView. 
Background: because the hole-punching code lives only in SurfaceView,
the overlay view can be covered by the application if the TV input
changes the position of SurfaceView via Session.layoutSurface().
This change punches a hole as large as TvView so that the underlying
overlayview can be shown properly.

Bug: 18420642
Change-Id: If9a829367083ce2002a4c4a4e4a4bbb623f7ad96
 2014-11-19 20:27:55 +09:00
Nicolas Prevot
97166e0790 am 9b07760d: am 439f17e6: am 76ea69b3: Merge "Fix javadoc in UserManager mentioning application restrictions." into lmp-mr1-dev 
* commit '9b07760dbcc19f47b9ee02081b26a9bbc2a40157':
  Fix javadoc in UserManager mentioning application restrictions.
 2014-11-19 10:08:38 +00:00
Nicolas Prevot
9b07760dbc am 439f17e6: am 76ea69b3: Merge "Fix javadoc in UserManager mentioning application restrictions." into lmp-mr1-dev 
* commit '439f17e622b3aaca2003eeeee2bb423abe6777a9':
  Fix javadoc in UserManager mentioning application restrictions.
 2014-11-19 10:01:51 +00:00
Nicolas Prevot
439f17e622 am 76ea69b3: Merge "Fix javadoc in UserManager mentioning application restrictions." into lmp-mr1-dev 
* commit '76ea69b35e45f4b23dfb7b39c6cd790b00576526':
  Fix javadoc in UserManager mentioning application restrictions.
 2014-11-19 09:55:44 +00:00
Nicolas Prevot
76ea69b35e Merge "Fix javadoc in UserManager mentioning application restrictions." into lmp-mr1-dev 2014-11-19 09:46:54 +00:00
Alan Viverette
67fd871bc5 am ea3219ff: am 4be155e8: am a489f0b3: Merge "Re-initialize data when changing time picker 24-hour mode" into lmp-mr1-dev 
* commit 'ea3219ffa9a6b23f6a2bbcbbe6f6ca83490eadad':
  Re-initialize data when changing time picker 24-hour mode
 2014-11-19 02:48:41 +00:00
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
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