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

159730 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
2e982258f1 Merge "SysUI: Refactor the NetworkControllerImpl" into lmp-mr1-dev 2014-11-19 21:18:22 +00:00
Geoffrey Borggaard
db1e7fa097 Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-dev 
automerge: e4590cf

* commit 'e4590cff5bbe581a1326abe68115b551585c43ff':
  Setting ADB_ENABLED may result in a SecurityException.
 2014-11-19 20:50:12 +00:00
Vinit Deshpande
a34f3d30c6 am 800bf3ae: Merge "Fix WPS docs for LABEL method" into lmp-mr1-dev 
* commit '800bf3ae6e9affb151b3b0b368c4a3dd22bb1fa0':
  Fix WPS docs for LABEL method
 2014-11-19 20:29:56 +00:00
Eric Laurent
6368a7df18 AudioSystem JNI: fix AudioPortConfig mask usage 
Bug: 18444838.
Change-Id: I9151538399001c719b9e0681c00d47a26928896c
 2014-11-19 12:18:32 -08:00
Vinit Deshpande
800bf3ae6e Merge "Fix WPS docs for LABEL method" into lmp-mr1-dev 2014-11-19 20:17:22 +00:00
Alan Viverette
7573f496a1 Fix several small layout and color issues 
Adjusts switch track asset for consistent alignment across DPI buckets,
adjusts edit text background. Lightens the "Light" theme action bar
color so that it doesn't blend in with the action bar shadow.

BUG: 18430444
BUG: 18356558
BUG: 18390994
Change-Id: I1d1e26239fa0c921a65e4ec8b5df0b0093b3989c
 2014-11-19 11:59:24 -08:00
Geoffrey Borggaard
e4590cff5b Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-dev 2014-11-19 19:56:48 +00:00
xinhe
62a22d5b1f resolved conflicts for merge of 046f3843 to lmp-sprout-dev(DO NOT MERGE) 
The change is already in MR1 branch

Change-Id: I4ae35a8f76fdc2d4b1cdf2773dc27ff2da85b5ff
 2014-11-19 11:48:43 -08:00
Geoffrey Borggaard
ba45b96a37 Setting ADB_ENABLED may result in a SecurityException. 
If the restriction UserManager.DISALLOW_DEBUGGING_FEATURES is enforced,
then any attempt to set ADB_ENABLED will result in a SecurityException.
This can result in the device not being able to boot.
Bug: 18433477

Change-Id: I21e4b406ad0fa89b7d4b678eac1baf212a3c7acd
 2014-11-19 14:26:08 -05:00
Andrew Lee
3f4244773d am e6a1e993: Merge "Add GENERIC_CONFERENCE to phone capabilities." into lmp-mr1-dev 
* commit 'e6a1e993c2e3663ee60085b66fe8697d5de6e268':
  Add GENERIC_CONFERENCE to phone capabilities.
 2014-11-19 19:06:32 +00:00
Andrew Lee
e6a1e993c2 Merge "Add GENERIC_CONFERENCE to phone capabilities." into lmp-mr1-dev 2014-11-19 19:00:41 +00:00
Andres Morales
29db396ea9 am 6722598e: Merge "Add a checksum to FRP partition" into lmp-mr1-dev 
* commit '6722598ef3d23f75d244399536b2302b30388c51':
  Add a checksum to FRP partition
 2014-11-19 18:16:03 +00:00
Andres Morales
6722598ef3 Merge "Add a checksum to FRP partition" into lmp-mr1-dev 2014-11-19 18:09:53 +00:00
xinhe
046f3843f1 Merge "Add configuration to control converting sms destination number" into lmp-dev 2014-11-19 17:47:25 +00:00
Amit Mahajan
6f10d1c34e am b22462c5: Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev 
* commit 'b22462c57f35404f5b39680a9fb76165968d8faf':
  Adding new setting LTE_SERVICE_FORCED.
 2014-11-19 17:44:33 +00:00
Amit Mahajan
b22462c57f Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev 2014-11-19 17:38:23 +00:00
John Spurlock
9d48ec7a5c am 2ee054b4: Merge "Volume: Ensure ring/notif slider is enabled when ringer=vibrate." into lmp-mr1-dev 
* commit '2ee054b4f099ce67dffc29329612170305053783':
  Volume: Ensure ring/notif slider is enabled when ringer=vibrate.
 2014-11-19 17:24:09 +00:00
John Spurlock
2ee054b4f0 Merge "Volume: Ensure ring/notif slider is enabled when ringer=vibrate." into lmp-mr1-dev 2014-11-19 17:19:15 +00:00
Geoff Mendal
5b95c75582 am 9792edd1: (-s ours) am 5fafd21b: (-s ours) Import translations. DO NOT MERGE 
* commit '9792edd17c777118f64a585272c9f11112cb22d7':
  Import translations. DO NOT MERGE
 2014-11-19 16:59:27 +00:00
Geoff Mendal
9792edd17c am 5fafd21b: (-s ours) Import translations. DO NOT MERGE 
* commit '5fafd21b1f15930b729f067be7d2c584add3217b':
  Import translations. DO NOT MERGE
 2014-11-19 16:55:43 +00:00
John Spurlock
5eb21f3466 Volume: Ensure ring/notif slider is enabled when ringer=vibrate. 
Although the audio policy makes a distinction between voice capable
and not when determining the default active stream, have the panel
recognize this condition and behave the same way (enable the slider)
on all devices.

Bug: 17405530
Change-Id: If3e1af3078f47bc1205545e919ccc6206020e7b2
 2014-11-19 11:54:53 -05:00
Geoff Mendal
cfe34ebce6 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-19 16:49:40 +00:00
Jorim Jaggi
4e857f4ef0 Fade notifications when exiting dozing 
Bug: 18146441
Change-Id: Ifa0cbb8157c65768c3a0c584166ca88c3016b730
 2014-11-19 16:52:43 +01:00
Geoff Mendal
5fafd21b1f Import translations. DO NOT MERGE 
Change-Id: I97c8d622957c88f2186e7d3116726b7ba33703c7
Auto-generated-cl: translation import
 2014-11-19 07:52:29 -08:00
Geoff Mendal
0f2e8a9fd3 Import translations. DO NOT MERGE 
Change-Id: Ic62940d6ffe06c77d7eacfcf53af30850a7e3d38
Auto-generated-cl: translation import
 2014-11-19 07:46:41 -08: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
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
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
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
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
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 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 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
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