Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
195,373 Commits 3 Branches 0 Tags
05dee112a13b715e29fdff16d57a75256d1ee044
Commit Graph

52517 Commits

Author SHA1 Message Date
Zach Johnson
05dee112a1 am b8b242de: am 841e7eb9: Merge "Update intents for CarrierService" into mnc-dev 
* commit 'b8b242de613dcd8f254274a142e719d24e7bc7cc':
  Update intents for CarrierService
 2015-05-28 00:26:18 +00:00
Fyodor Kupolov
e3d88fc251 am 8d5f04d9: am 12e5fec2: Merge "Fixed indentation in setProfileName method" into mnc-dev 
* commit '8d5f04d9690f6526c57612d72922f29cb78c1be6':
  Fixed indentation in setProfileName method
 2015-05-28 00:26:12 +00:00
Nancy Chen
8f1f3153af am ff29b964: am f279341a: Merge "Update docstrings for VoicemailContract to be more descriptive." into mnc-dev 
* commit 'ff29b9641eadcf9c9dce743a67cf3a7634c18360':
  Update docstrings for VoicemailContract to be more descriptive.
 2015-05-28 00:26:08 +00:00
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
Zach Johnson
854d9447d6 am ad13df83: am 68bca39a: Merge "Drop the "Config". Just "CarrierService". It\'s cleaner." into mnc-dev 
* commit 'ad13df83dfac74856501bd286a93078f137cb43a':
  Drop the "Config". Just "CarrierService". It's cleaner.
 2015-05-27 23:31:35 +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
4120e94347 am 36fe17ac: am 60bf94e3: Merge "Move ApplicationInfo hardware acceleration to public flags" into mnc-dev 
* commit '36fe17acc4857d7e5b4b7c456c4589a087a9116f':
  Move ApplicationInfo hardware acceleration to public flags
 2015-05-27 21:49:37 +00: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
d8e796855f am 838cd2e4: am 5ccfe51d: Merge "[LockSettings] migrate password attempt throttling to hardware" into mnc-dev 
* commit '838cd2e467690492e89f5f53f60b3b4dc42c720b':
  [LockSettings] migrate password attempt throttling to hardware
 2015-05-27 20:40:48 +00:00
Alan Viverette
08064a63dc am d3972f39: am d0699fa5: Merge "Avoid strict mode violation during saveAttributeData" into mnc-dev 
* commit 'd3972f39b862252f3aee443f0fdc23e9ac4882cf':
  Avoid strict mode violation during saveAttributeData
 2015-05-27 20:40:38 +00:00
Cedric Ho
41964750d3 am b343bfd9: am 2b919d4f: Merge "Add getCallingUid() to RecognitionService.Callback." into mnc-dev 
* commit 'b343bfd95a70b77b4d32dd777288b66ea5b024aa':
  Add getCallingUid() to RecognitionService.Callback.
 2015-05-27 20:20:18 +00: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
dc870638ff am 1ed681dd: am 165229ba: Merge "Add workaround for measuring stacked button bar layout" into mnc-dev 
* commit '1ed681dd2a3daa0cc109177703f2433ec354de58':
  Add workaround for measuring stacked button bar layout
 2015-05-27 18:01:09 +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
bd24d2c73d am ea653eb8: am 9123e666: Merge "Update cached child enabled state before selector state" into mnc-dev 
* commit 'ea653eb83f979b739fb2a934910e3bb8c87b7ea7':
  Update cached child enabled state before selector state
 2015-05-27 00:18:48 +00:00
Alan Viverette
618d576899 am ba607f4d: am 2232addd: Offset accessibility focus rect for view root\'s scrollY 
* commit 'ba607f4d2fc47c334e5f4699ef84c51bace33e9b':
  Offset accessibility focus rect for view root's scrollY
 2015-05-27 00:18:43 +00: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
bd678c2aaa am 090a0636: am 3452d2d0: Merge "Honor password visible setting in CryptKeeper" into mnc-dev 
* commit '090a06365f958908bef4c399f82a32c79600a4e8':
  Honor password visible setting in CryptKeeper
 2015-05-26 22:20:57 +00:00
Abodunrinwa Toki
dd98935f7b am 71eca132: am 4d2fc599: Merge "Hide the floatingtoolbar when content rect is invisible." into mnc-dev 
* commit '71eca132c7e8b97e435487b9761492d0d4bd7464':
  Hide the floatingtoolbar when content rect is invisible.
 2015-05-26 21:58:48 +00: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
630e9b5e7f am a4aab96e: am 5e0ef0d0: Merge "Say in the doc that DISALLOW_CONFIG_VPN now works." into mnc-dev 
* commit 'a4aab96e2099a47a76cd8b684d06838a8d744c3e':
  Say in the doc that DISALLOW_CONFIG_VPN now works.
 2015-05-26 21:06:09 +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
571f702b6d am b8f3b76a: am 12e0b390: Merge "Zen: Calendar auto-rule tracks primary calendar for corp profile." into mnc-dev 
* commit 'b8f3b76a50b32886608d1ad13171a8cf508fcd4d':
  Zen: Calendar auto-rule tracks primary calendar for corp profile.
 2015-05-26 20:01:44 +00: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
70e4baa39e am b301b64a: am da1b3981: Merge "Support icons in the FloatingToolbar" into mnc-dev 
* commit 'b301b64ae9e1db4e4bc39f4cfd97dbaeaafeec51':
  Support icons in the FloatingToolbar
 2015-05-26 18:52:01 +00:00
Abodunrinwa Toki
da1b398173 Merge "Support icons in the FloatingToolbar" into mnc-dev 2015-05-26 18:26:37 +00:00
Paul Jensen
7a5a03ccce am 8164d4c3: am 46ed04de: Merge "Add javadoc comments mentioning ConnectivityManager API permissions." into mnc-dev 
* commit '8164d4c3c601eb341bafb25cf05a069d7029bfed':
  Add javadoc comments mentioning ConnectivityManager API permissions.
 2015-05-26 18:02:14 +00:00
Alan Viverette
2f4b1cd935 am 50b30be2: am 75a857ce: Merge "Handle error states when refreshing accessibility node" into mnc-dev 
* commit '50b30be28bfb8bdf36835efe10e92f84b85b9b0e':
  Handle error states when refreshing accessibility node
 2015-05-26 17:40:12 +00:00
Jean-Michel Trivi
17601d918f am e95b750b: am dfe318d7: Merge "Ringtone picker is not affected by current sonification policy" into mnc-dev 
* commit 'e95b750bb353bec7f7cbc370a6c883828f7319c9':
  Ringtone picker is not affected by current sonification policy
 2015-05-26 17:40:07 +00:00
Chet Haase
37c3098940 am a2a8eca8: am 1ddc95eb: Merge "Clarify example for Deep Share" into mnc-dev 
* commit 'a2a8eca8ddcf2f155363f4d4c41748a0c6eea0f3':
  Clarify example for Deep Share
 2015-05-26 17:39:48 +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
6424ef60b3 am b0e12ac7: am 16224288: Merge "Add constants for permissions granted status api" into mnc-dev 
* commit 'b0e12ac758e4770635cf13d97e97c37b7f5ec812':
  Add constants for permissions granted status api
 2015-05-26 16:53:35 +00:00
Jason Monk
1622428879 Merge "Add constants for permissions granted status api" into mnc-dev 2015-05-26 16:32:57 +00:00