Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
245,370 Commits 3 Branches 0 Tags
6a4d3332601b3133ba7672f179c5aff4bf71634b
Commit Graph

245370 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip P. Moltmann
b4a45472bb Merge "Add Samsung print recommendation plugin." into nyc-dev 2016-05-25 18:51:12 +00:00
Derek Tan
818822ad5d Per API review, revert the API renaming CL. 
Revert "Multi-SIM - Fixing inconsistent naming in CarrierConfigManager."

This reverts commit 3bf26b5605.

Bug: 28295813
Change-Id: I44e7925c86c68a79b8d962670baadea7a7227ca2
 2016-05-25 18:37:05 +00:00
Chad Brubaker
56f2f91793 Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am: f2e0a719d0 am: 56f32483b0 
am: d1df52a46b

* commit 'd1df52a46beb5babd0d9f3257b2ade53c9c763cf':
  Fix incorrect cleartext attribute

Change-Id: I613e1eae55525d0326a8513ed25903bbaf0d3fb9
 2016-05-25 18:36:47 +00:00
Alex Klyubin
d1df52a46b Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am: f2e0a719d0 
am: 56f32483b0

* commit '56f32483b04723bf750e51badcfec3203c352d32':
  Fix incorrect cleartext attribute

Change-Id: I689b8df2a928e63b7c0b06198b06e2c6798bcba5
 2016-05-25 18:24:31 +00:00
Sid Soundararajan
17d29b6d70 Alternate method for adding dismiss in talkback 
This is an alternate solution. Not sure if this is better than
the current solution.

BUG: 28594452
Change-Id: I08b4ca8741ceb3491950ba779510b08775bd0ee7
 2016-05-25 11:18:22 -07:00
Chad Brubaker
56f32483b0 Merge "Fix incorrect cleartext attribute" into mnc-mr-docs 
am: f2e0a719d0

* commit 'f2e0a719d00c4a7c6865f6784efc9b3f88421136':
  Fix incorrect cleartext attribute

Change-Id: I83bfa396764d6724ceb483e256a96b929c7886d4
 2016-05-25 18:16:03 +00:00
Selim Cinek
6088cf67e8 Merge "Fixed a bug where the expand button was invisible" into nyc-dev 2016-05-25 18:14:57 +00:00
Antonio Cansado
904237f839 Cleaning up NetworkStatsManager. 
- Throwing SecurityExceptionand and IllegalArgumentException instead of null for new APIs
- removing @removed APIs

Bug:27530098,27379882
Change-Id: Ifbe65bfc5051aa33aff2baa22cfa8e67b0f7c358
 2016-05-25 11:07:41 -07:00
Alex Klyubin
f2e0a719d0 Merge "Fix incorrect cleartext attribute" into mnc-mr-docs 2016-05-25 18:04:54 +00:00
Chris Banes
163236156f Merge "Fix text appearances not working in colored button styles" into nyc-dev 2016-05-25 17:57:12 +00:00
Christopher Tate
3eddecc3bc Build JobStatus objects outside the lock 
Constructing a JobStatus can be a surprisingly heavy operation, potentially
involving IPC; so do so outside the primary lock when possible in order to
reduce lock contention.

Bug 28946245

Change-Id: I51fffa6d29d566647edb583ae6e46ed6038d36e3
 2016-05-25 10:54:18 -07:00
Christopher Tate
2be3de1723 Backport of backup transport whitelist 
Sysconfig define a whitelist of permitted backup transports

Previously any apk bundled in priv-app could insert a backup transport.
Reduce risk surface by giving the OEM explicit control over who is
allowed to handle backup data.

Bug 28406080

Backport of 494df79172 from N

Change-Id: I9f90e324169a68720d608f74754d284a7e59cf87
 2016-05-25 10:51:38 -07:00
Chong Zhang
15818e1156 Merge "Destroy saved surfaces if one of the last visible windows gets removed" into nyc-dev 2016-05-25 17:32:21 +00:00
Jason Monk
c4b6e2a184 Merge "QS Edit: Fix up accessibility" into nyc-dev 2016-05-25 17:11:31 +00:00
Jason Monk
630436c9ed Merge "QS Edit: Hide black bar in landscape" into nyc-dev 2016-05-25 17:11:23 +00:00
Jason Monk
7e10e630b4 Merge "QS API: Handle return value from bindServiceAsUser" into nyc-dev 2016-05-25 17:11:15 +00:00
Jason Monk
8fd8a4fde8 Merge "QS: Fix QS touch breaking" into nyc-dev 2016-05-25 17:11:08 +00:00
Julia Reynolds
d3827be162 Merge changes from topic 'cps' into nyc-dev 
* changes:
  Api updates.
  Note timezone changes.
 2016-05-25 17:09:26 +00:00
Julia Reynolds
ad41a6f0de Api updates. 
Change-Id: Ibafef673c54e4ff07bca2bbe70db6cad799b8033
Fixes: 28818092
 2016-05-25 13:02:50 -04:00
Julia Reynolds
83eec7037b Note timezone changes. 
Bug: 28945282
Change-Id: I62fc62e359435f19fecd7e52b2fe778475c5804c
 2016-05-25 13:02:39 -04:00
Mady Mellor
4f3ab93147 Changes based on API council feedback for performContextClick 
Added an overloaded version with (float x, float y).

Fixes: 28295818
Change-Id: I41c2bf225964436655986b3ad4d0c630c658e38b
 2016-05-25 09:52:51 -07:00
Chris Banes
ec39b57e6f Fix text appearances not working in colored button styles 
Caused by using an explicit textColor in the base
styles, which will always override any textColors in the
text appearance.

BUG: 28933171
Change-Id: I3a9b2884cdd66b329593ae5cea0c314244f4f116
 2016-05-25 16:49:43 +00:00
Roshan Pius
2078d3499b BatteryStats: Allow for sample errors in wlan stats 
Add some leeway in the reported time because some inaccuracy
is expected in these stats between samples.

BUG: 28932100
Change-Id: Ia643fa666ca16c0c707d189ec2bc703fe1ef08a4
 2016-05-25 09:41:31 -07:00
Alan Viverette
3fb5c7b8fa Fix DatePicker.setMin/MaxDate() 
Previously it would only allow year changes, which... doesn't make sense.

Bug: 28953902
Change-Id: I9b15b96662d9d496e11fb426ff23f14b26e90800
 2016-05-25 12:34:55 -04:00
Jason Monk
d075b21a85 QS: Fix QS touch breaking 
Seems not all of the QS container logic was inside the inflate
callback.

Change-Id: I78a8b40d1c181f5dac7127a5b5d20d45ae0f333e
Fixes: 28177371
 2016-05-25 12:30:51 -04:00
John Reck
f4ae997719 Merge "Fix a translate issue with saveLayer" into nyc-dev 2016-05-25 16:27:31 +00:00
Diego Perez
36cd747bb6 Merge "Workaround to display menus for AppCompat themes" into nyc-dev 2016-05-25 16:23:56 +00:00
Alan Viverette
cfbca5640c Merge "Use ICU's Calendar class in date picker & related classes" into nyc-dev 2016-05-25 16:20:16 +00:00
Kenny Guy
646a817caf Merge "Update suspended to disabled." into nyc-dev 2016-05-25 15:49:52 +00:00
Alan Viverette
68763be41c Use ICU's Calendar class in date picker & related classes 
Also organizes imports.

Bug: 28756630
Change-Id: I4e59c4b35c88edd94ff4b2945ad9feb2a4bd0022
 2016-05-25 11:42:42 -04:00
Jason Monk
6d21e0d8d2 QS API: Handle return value from bindServiceAsUser 
To avoid crashes better.

Change-Id: I72e74729fbc0b1400c21e1ebc165b565ecd13fba
Fixes: 28721139
 2016-05-25 11:37:47 -04:00
Jason Monk
931f5464f5 QS Edit: Hide black bar in landscape 
Change-Id: I954e5571c01945b697c6254c168c1830467ff7db
Fixes: 28924803
 2016-05-25 11:19:04 -04:00
Adam Powell
ef817a1deb Merge "Update preloaded drawables" into nyc-dev 2016-05-25 14:59:34 +00:00
Jason Monk
ad5db2979b QS Edit: Fix up accessibility 
Change-Id: I13d426d4ae447c7db074bc7165067870bd8cae5d
Fixes: 28913622
 2016-05-25 10:54:43 -04:00
Lajos Molnar
0581ee4971 media: check profile, level and bitrate for isFormatSupported 
Bug: 28671284
Change-Id: I90639816a7410cf65bcd1c5549c3830ca43b8140
 2016-05-25 07:44:15 -07:00
Ricky Wai
7b9eb419e3 Store work lock type even it uses unified lock 
If we are not storing this, LockPatternUtils.isSecure(workUserId)
will return false, and cause some methods like trySetQuietModeDisabled()
cannot show screen lock correctly.

Bug: 28738725
Change-Id: I7d0b61022b0afff2dac4cdae72d558118ea892e7
 2016-05-25 15:38:34 +01:00
Alan Viverette
5c9444216d Merge "Prevent LayerDrawable bounds updates from being re-entrant" into nyc-dev 2016-05-25 14:19:40 +00:00
Alan Viverette
10ed7de7ae Merge "Default system theme should be DeviceDefault" into nyc-dev 2016-05-25 14:18:28 +00:00
Ricky Wai
d398244513 Hide work profile key in user credentials screen 
Bug: 28878708
Change-Id: Ib250fae2388b061430d93b7d65133002ce664993
 2016-05-25 13:11:09 +00:00
Ricky Wai
977ade26dd Do not allow DPM.resetPassword() when child profile exists or user is locked 
Bug: 28878708
Change-Id: Iaae2a9ba9c7c0ff388264c474c78a0dcd9fec258
 2016-05-25 13:09:44 +00:00
Ricky Wai
f420c413b9 Merge "Unlock work profile storage even work mode is off" into nyc-dev 2016-05-25 13:06:24 +00:00
Ricky Wai
99df649aa4 Merge "Do not tie managed profile synchronously in onUnlockUser()" into nyc-dev 2016-05-25 13:04:32 +00:00
Ricky Wai
4613fe41ac Add resetKeyStore() in LockSettingsService 
Before resetKeyStore(), it will back up child profile keys,
and will be restored after primary profile keystore is cleared.

Bug: 28878708
Change-Id: I0cb4a1f885d468894bc7eb95af694328bf92ce16
 2016-05-25 11:39:56 +01:00
Yohei Yukawa
50c33d1ca1 Merge "Make IMM more robust to spurious window focus-in" into nyc-dev 2016-05-25 04:47:31 +00:00
Seigo Nonaka
7c8305bcfe Merge "Use original theme for SuggestsionsPopupWindow" into nyc-dev 2016-05-25 03:24:11 +00:00
Hugo Benichi
9d4e66ece6 Merge "Fix default network transition event recording" into nyc-dev 2016-05-25 03:22:32 +00:00
Hang Yin
581387a4ae Merge "Created 4 camera preview stress test cases." into nyc-dev 2016-05-25 03:14:02 +00:00
TreeHugger Robot
1893c4cea7 Merge "Updating user restrictions when they are removed" into nyc-dev 2016-05-25 03:11:49 +00:00
Keisuke Kuroyanagi
edebcae978 Merge "Set input method mode for CascadingMenuPopup." into nyc-dev 2016-05-25 02:06:25 +00:00
Doris Liu
54d89e078d Merge "Clamp start delay to non-negative range" into nyc-dev 2016-05-25 01:41:14 +00:00