Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
193,271 Commits 3 Branches 0 Tags
257cd97d670d0bbb257a48b7ee2daa368c95662c
Commit Graph

52235 Commits

Author SHA1 Message Date
Zach Johnson
841e7eb929 Merge "Update intents for CarrierService" into mnc-dev 2015-05-28 00:02:35 +00:00
Fyodor Kupolov
12e5fec238 Merge "Fixed indentation in setProfileName method" into mnc-dev 2015-05-27 23:56:06 +00:00
Zach Johnson
5c04bd767b Update intents for CarrierService 
Keep the bind intent and the config intent separate.

Change-Id: I645a7e697d49d46a4870b7b3a252b3214ee85412
 2015-05-27 16:53:09 -07:00
Fyodor Kupolov
78f1314a69 Fixed indentation in setProfileName method 
Change-Id: I819bfd509b184b7952d8f9c466c9418353f890cb
 2015-05-27 16:52:45 -07:00
Nancy Chen
f279341a91 Merge "Update docstrings for VoicemailContract to be more descriptive." into mnc-dev 2015-05-27 23:52:00 +00:00
Nancy Chen
a042e6c74e Update docstrings for VoicemailContract to be more descriptive. 
Bug: 21343781
Change-Id: I221f61d4e9306a92c736a12b2cff3d9fccebdc47
 2015-05-27 15:54:55 -07:00
Zach Johnson
42ecc9eb90 Drop the "Config". Just "CarrierService". It's cleaner. 
b/21308727

Change-Id: I6515888c7804349ecd07c4dd74575ef89a4bea59
 2015-05-27 15:30:31 -07:00
Alan Viverette
60bf94e3be Merge "Move ApplicationInfo hardware acceleration to public flags" into mnc-dev 2015-05-27 21:30:07 +00:00
Alan Viverette
d70b9e7aea Move ApplicationInfo hardware acceleration to public flags 
Bug: 21342038
Change-Id: I5af826f3f2921eef24725c909304243c67f3da78
 2015-05-27 14:29:20 -07:00
Andres Morales
5ccfe51d8b Merge "[LockSettings] migrate password attempt throttling to hardware" into mnc-dev 2015-05-27 18:37:32 +00:00
Alan Viverette
d0699fa569 Merge "Avoid strict mode violation during saveAttributeData" into mnc-dev 2015-05-27 18:00:18 +00:00
Cedric Ho
2b919d4f69 Merge "Add getCallingUid() to RecognitionService.Callback." into mnc-dev 2015-05-27 17:46:41 +00:00
Alan Viverette
cffaf7e7e4 Add workaround for measuring stacked button bar layout 
Bug: 21300645
Change-Id: If9544da4995c3dce118dd9e36d42764662b3aecd
 2015-05-27 10:28:05 -07:00
Cedric Ho
8fedcdad36 Add getCallingUid() to RecognitionService.Callback. 
Change-Id: I596471625eee24ec93d08650c33461d35ad0aa07
 2015-05-27 09:51:19 -07:00
Andres Morales
2397427cb1 [LockSettings] migrate password attempt throttling to hardware 
leverage root protected, cryptographically secured hardware
if available

Bug: 21118563
Change-Id: Ifa804c5a0728bfd14466eb2a84051bace6d33d57
 2015-05-26 19:48:51 -07:00
Alan Viverette
9123e666bb Merge "Update cached child enabled state before selector state" into mnc-dev 2015-05-26 22:27:31 +00:00
Alan Viverette
2232adddc5 Offset accessibility focus rect for view root's scrollY 
Previously we were only partially transforming the focus rect into
window coordinates, so it was offset when the window was panned (for
example, when the IME was showing).

Bug: 20113389
Change-Id: I41f5ed20cb1404232b7042d37ca2fc725f9ee476
 2015-05-26 15:24:18 -07:00
Paul Lawrence
3452d2d0db Merge "Honor password visible setting in CryptKeeper" into mnc-dev 2015-05-26 21:52:58 +00:00
Abodunrinwa Toki
4d2fc599cf Merge "Hide the floatingtoolbar when content rect is invisible." into mnc-dev 2015-05-26 21:31:36 +00:00
Nicolas Prevot
5e0ef0d0e6 Merge "Say in the doc that DISALLOW_CONFIG_VPN now works." into mnc-dev 2015-05-26 20:39:28 +00:00
Abodunrinwa Toki
6a0b277c7c Hide the floatingtoolbar when content rect is invisible. 
Hide the floating toolbar when the content rect is outside the
source view's visible area.

Bug: 21304845
Change-Id: I0dd10ad2cda7a8d9b05c81334cdfbd68c22dbc6a
 2015-05-26 21:35:18 +01:00
John Spurlock
12e0b390ef Merge "Zen: Calendar auto-rule tracks primary calendar for corp profile." into mnc-dev 2015-05-26 19:41:53 +00:00
John Spurlock
1b8b22b1a4 Zen: Calendar auto-rule tracks primary calendar for corp profile. 
- Track the calendar provider for the managed profile user if found.
 - Add userId to the shared data structure to disambig calendar ids.
 - Delay rule update a bit to guard against chatty updates.
 - Fix logging in calendar rule.

Bug: 21155107
Change-Id: Id2303fcc39b1fa7417b1844b7869d773ef92434c
 2015-05-26 15:39:05 -04:00
Abodunrinwa Toki
da1b398173 Merge "Support icons in the FloatingToolbar" into mnc-dev 2015-05-26 18:26:37 +00:00
Paul Jensen
46ed04de08 Merge "Add javadoc comments mentioning ConnectivityManager API permissions." into mnc-dev 2015-05-26 17:37:33 +00:00
Alan Viverette
75a857cec5 Merge "Handle error states when refreshing accessibility node" into mnc-dev 2015-05-26 17:29:39 +00:00
Jean-Michel Trivi
dfe318d712 Merge "Ringtone picker is not affected by current sonification policy" into mnc-dev 2015-05-26 17:27:07 +00:00
Chet Haase
1ddc95ebb2 Merge "Clarify example for Deep Share" into mnc-dev 2015-05-26 17:15:59 +00:00
Jason Monk
1622428879 Merge "Add constants for permissions granted status api" into mnc-dev 2015-05-26 16:32:57 +00:00
dcashman
b7b7b5ece8 Merge "Set error code on failed keyset manifest parsing." into mnc-dev 2015-05-26 14:57:27 +00:00
Jason Monk
9cfa0cc51e Add constants for permissions granted status api 
Bug: 21078474
Change-Id: I6b0bcf0c11258ae263eb08366c14f9298798afdb
 2015-05-26 10:26:18 -04:00
Abodunrinwa Toki
b21562c465 Support icons in the FloatingToolbar 
Bug: 20202541
Change-Id: Id4d27851739ba557c7f7348094d79f0c5f782e6b
 2015-05-26 12:55:17 +01:00
Selim Cinek
912696e797 Merge "Fixed logspam and handling subwindows with the input consumer" into mnc-dev 2015-05-26 07:34:18 +00:00
Chet Haase
fd98809873 Clarify example for Deep Share 
Changed name of service to avoid using the actual class name
ChooserTargetService as the example service's name.

Issue #21418354 Clarify doc example for ChooserTargetService

Change-Id: I59bf67299fe7a8307504baf5e999c14f84a1e50d
 2015-05-25 08:47:36 -07:00
Svet Ganov
a759024394 Merge "Hide pakcage installer system APIs." into mnc-dev 2015-05-23 20:31:55 +00:00
Svet Ganov
0b316706b1 Hide pakcage installer system APIs. 
Change-Id: If5245ed2be7a3ebb50a7af924be85894314f6f47
 2015-05-23 13:25:11 -07:00
Selim Cinek
d6623618b2 Fixed logspam and handling subwindows with the input consumer 
Bug: 21402648
Change-Id: I4c1c73487dfd19ba452ff2077d8541547f149c3b
 2015-05-23 01:57:41 +00:00
Dianne Hackborn
dd5ee4b890 Merge "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"" into mnc-dev 2015-05-23 00:34:35 +00:00
Simranjit Singh Kohli
aefdaa5cbd Merge "[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]" into mnc-dev 2015-05-23 00:20:40 +00:00
Simranjit Singh Kohli
734f8fb69d [ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes] 
Fixing lots of bugs related to the ChooseAccount Activities.
1. Fix jank which is seen when no accounts are present on the device.
2. After addition of the account, return to the user.
3. Don't crash when the user provides null to allowableAccountTypes.
4. Updated documentation of AccountManager#newChooseAccountIntent.
5. Fix NPE.

Bug: 13104800
Bug: 17926560
Bug: 9626001

Change-Id: I0d1913e46560cfb458526a7c930a38049602d8f1
 2015-05-22 17:19:21 -07:00
Amith Yamasani
7870550a1b Merge "Add getPermissionGrantState method in device policy" into mnc-dev 2015-05-23 00:05:47 +00:00
Nicolas Prevot
298f98fa23 Say in the doc that DISALLOW_CONFIG_VPN now works. 
BUG:18902920
Change-Id: I761cba1f1e01fbe88f773887bf4e9233fc85cfef
 2015-05-22 16:43:03 -07:00
Yin-Chia Yeh
5cf9d8ac94 Merge "Camera: update available LSC map mode key type" into mnc-dev 2015-05-22 23:40:33 +00:00
Yin-Chia Yeh
656931d36d Camera: update available LSC map mode key type 
Bug: 21403373
Change-Id: I37101e2d0ef5cb8d66676dcdb16938ac8fe85c64
 2015-05-22 16:37:27 -07:00
Dianne Hackborn
4bb6b751fb Revert "resolved conflicts for merge of 47249f2a to mnc-dev" 
This reverts commit c7becb7ee7, reversing
changes made to 8562b08f04.
 2015-05-22 16:34:44 -07:00
dcashman
5db0cd49e8 Set error code on failed keyset manifest parsing. 
Bug: 21403585
Change-Id: I6f8e0766d373b1b0451b2abef7af6cbb089e4e0c
 2015-05-22 15:52:43 -07:00
Yin-Chia Yeh
9fbdc87422 Merge "Camera2: update FpsRange requirement" into mnc-dev 2015-05-22 20:57:08 +00:00
Amith Yamasani
184b3753de Add getPermissionGrantState method in device policy 
This is to have a way to query what permission state was set by
the profile owner.

Bug: 21356830
Change-Id: Ie396e946b4285267c1d95f82b9d9765b43697d3c
 2015-05-22 13:55:57 -07:00
Yin-Chia Yeh
5855162f80 Camera2: update FpsRange requirement 
Codegen doc update only.

Bug:13639914
Change-Id: Id8a4a237c409725831a65b4f134422cd261cad52
 2015-05-22 13:50:10 -07:00
Adam Powell
94518a4c35 Merge "Restore app expectations around drawable visibility change timing" into mnc-dev 2015-05-22 19:48:54 +00:00