Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
212,475 Commits 3 Branches 0 Tags
80e8db3d9cbdd6f42ca83b535abd26d761dc26ee
Commit Graph

52105 Commits

Author SHA1 Message Date
Dmitry Polukhin
80e8db3d9c [Backup] Special handling for sharedpref files in backup config 
Allow specifying sharedpref without .xml suffix as it is for
getSharedPreferences Android API. If .xml extension is missing for
sharedpref file name, it is added in include/exclude filters.

BUG: 20923818
Change-Id: I8bf3d43654b69d847e57c94f23aa3799e01948e6
 2015-08-21 10:28:02 +02:00
Florian Salbrechter
30c3c09071 Merge "Fix wrong javadoc in BluetoothAdapter." 2015-08-20 09:29:29 +00:00
Bart Sears
3b1c32eb5d Merge "Revert "Simplify TextureView draw path"" 2015-08-20 02:25:30 +00:00
Bart Sears
d35dcb1311 Revert "Simplify TextureView draw path" 
This reverts commit 20a248934c.

Change-Id: Iaa3ebb1d868acbe184080087aec312b43e87e3c7
 2015-08-20 02:23:39 +00:00
Jeff Sharkey
36d4aaeb6e am 39c49625: am e6983e87: am cd6ba412: am bbb5717d: am f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev 
* commit '39c4962580a52d5ca07f3576009564dddc8f4624':
  Pass underlying volume UUID to StorageVolume.
 2015-08-20 01:59:19 +00:00
Jeff Sharkey
39c4962580 am e6983e87: am cd6ba412: am bbb5717d: am f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev 
* commit 'e6983e877888dd51abe090b75fa568a64e9fc16e':
  Pass underlying volume UUID to StorageVolume.
 2015-08-20 01:57:52 +00:00
Jeff Sharkey
cd6ba4120c am bbb5717d: am f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev 
* commit 'bbb5717dee12ec37e0fcc6c186e1f80b9890e987':
  Pass underlying volume UUID to StorageVolume.
 2015-08-20 01:44:05 +00:00
Jeff Sharkey
bbb5717dee am f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev 
* commit 'f3ad1eabc1fa5252165bfe1516690d1026507f0a':
  Pass underlying volume UUID to StorageVolume.
 2015-08-20 01:33:59 +00:00
Jeff Sharkey
f3ad1eabc1 Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev 2015-08-20 01:28:30 +00:00
Chris Craik
87f9c42f54 Merge "Simplify TextureView draw path" 2015-08-20 00:02:09 +00:00
Chris Craik
20a248934c Simplify TextureView draw path 
bug:20461288

Change-Id: I239fbd26ab2177481c84feb62a1da68faeb634ac
 2015-08-19 16:59:45 -07:00
Chris Craik
571663bfd6 Merge "Throw exception when setting a fg/bg on TextureView" 2015-08-19 23:26:54 +00:00
Chris Craik
2e931eae35 Throw exception when setting a fg/bg on TextureView 
Change-Id: Iead53e0947d941ebc1331f77fc478c475e24c812
 2015-08-19 16:13:04 -07:00
Roozbeh Pournader
5afe8f2089 Merge "Add first implementation of LocaleList." 2015-08-19 22:38:24 +00:00
Roozbeh Pournader
0ba0d6bb18 Add first implementation of LocaleList. 
This is a first implementation, just to get the basics in, so we can
experiement with how the system would interact with locale lists.

Change-Id: I75d386f24f693c6c1bdefc9386a7142aec2de37c
 2015-08-19 15:31:08 -07:00
Lorenzo Colitti
e0938bed96 am a5bfd73a: am ab5e962e: am d7121f56: am 0257c82f: am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev 
* commit 'a5bfd73ab683d3310ee3ce31d7ad3edb656aa858':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-08-19 21:23:03 +00:00
Filip Gruszczynski
6c8b36f767 Merge "Improve animating from recents to multi window state." 2015-08-19 21:21:03 +00:00
Jeff Sharkey
8e2ea2a9f1 Pass underlying volume UUID to StorageVolume. 
To help MediaProvider uniquely identify storage devices, pass through
the UUID of the underlying private storage volume.

Bug: 23329611
Change-Id: I22ee7ea98fcb208d7797310acb3396a3f074f09b
 2015-08-19 14:16:05 -07:00
Lorenzo Colitti
a5bfd73ab6 am ab5e962e: am d7121f56: am 0257c82f: am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev 
* commit 'ab5e962e1dd05799980342757edd8e83f4a76a8e':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-08-19 21:15:22 +00:00
Chien-Yu Chen
b6aa2fdb5d am 84551d61: am 6fdab993: am 86d86c2e: am c3aa7f3a: Merge "Camera2: Handle surface size change" into mnc-dr-dev 
* commit '84551d61fd4942aa4afb677ea3ae6ce7674c866c':
  Camera2: Handle surface size change
 2015-08-19 21:07:43 +00:00
Chien-Yu Chen
84551d61fd am 6fdab993: am 86d86c2e: am c3aa7f3a: Merge "Camera2: Handle surface size change" into mnc-dr-dev 
* commit '6fdab993919a1784676782ad1c67068a7f8a7fdc':
  Camera2: Handle surface size change
 2015-08-19 21:02:37 +00:00
Lorenzo Colitti
d7121f5651 am 0257c82f: am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev 
* commit '0257c82fa122243e97e4a1f4ef4bc4b8c21bd692':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-08-19 21:01:33 +00:00
Lorenzo Colitti
0257c82fa1 am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev 
* commit '11e84bde9e98cb4b777a67208989d259883e9375':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-08-19 20:54:48 +00:00
Chien-Yu Chen
86d86c2e7c am c3aa7f3a: Merge "Camera2: Handle surface size change" into mnc-dr-dev 
* commit 'c3aa7f3a7564f36db58d8a9a5470fd64f6fa282b':
  Camera2: Handle surface size change
 2015-08-19 20:48:27 +00:00
Chien-Yu Chen
c3aa7f3a75 Merge "Camera2: Handle surface size change" into mnc-dr-dev 2015-08-19 20:40:11 +00:00
Filip Gruszczynski
170192ab55 Improve animating from recents to multi window state. 
Previously all windows would start animating from a single thumbnail
that was clicked. Now each animates from its thumbnail, including
properly animating the thumbnail header. This involves System UI
providing information about the thumbnail setup and app transition code
using it to setup each individual animation.

Change-Id: I6f45c94af6bcbf6898b8ed757d83505af99ed6b1
 2015-08-19 12:20:46 -07:00
Xiaohui Chen
98404fdc0b Clean up USER_OWNER reference. 
Bug: 19913735
Change-Id: I441672b360fa0fff5453f72c88f9577b5cc8eecf
 2015-08-19 18:34:46 +00:00
Alan Viverette
f52b66588f Merge "Ensure layout resolution occurs when relative rules are removed" 2015-08-19 18:30:27 +00:00
Paul Jensen
aae613d961 Don't mark NetworkRequests restricted when they don't have restricted caps 
Requests without NET_CAPABILITIES_INTERNET and just the default network
capabilities should not be marked restricted.  Without this fix apps
can hit permissions exceptions if they inadvertently make requests
without NET_CAPABILITIES_INTERNET.

Bug:23164917
Change-Id: I4c7136821315bcb05dfc42ffbc505a5d4f6109e6
 2015-08-19 11:08:38 -04:00
Derek Sollenberger
55f4445013 Merge "Add ninePatch support to Canvas.h" 2015-08-19 13:10:40 +00:00
Jim Miller
4ea5152bd8 am 849b9e58: am ce6fb7bb: am 7ef77271: am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev 
* commit '849b9e58d6775a393f7d86a6305b658c6af9d16f':
  Reset fingerprint lockout timer when strong auth is used.
 2015-08-19 02:21:58 +00:00
Jim Miller
849b9e58d6 am ce6fb7bb: am 7ef77271: am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev 
* commit 'ce6fb7bba967a9b33e5d3afe60fff66c5b2ca034':
  Reset fingerprint lockout timer when strong auth is used.
 2015-08-19 01:43:12 +00:00
Chong Zhang
aa1fd4e6d3 Merge "Restore recent task to freeform space when resizing" 2015-08-18 23:55:07 +00:00
Jim Miller
7ef772713f am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev 
* commit 'bea9d7b94cfa16da8f257ed705e218b017d459a7':
  Reset fingerprint lockout timer when strong auth is used.
 2015-08-18 23:18:36 +00:00
Chien-Yu Chen
828adbba24 Camera2: Handle surface size change 
When comparing if two OutputConfigurations are equal, also check
the width, height, format, dataspace when the output configurations
were created. With this, CameraDeviceImpl knows that the surface has
changed sizes and will reconfigure the stream.

Bug: 12250682
Change-Id: Ie5965d242b2017b87a76d26cdc2f6b700082e002
 2015-08-18 16:06:54 -07:00
Tao Bao
53c217f6c4 am efb71f44: am 2e3746ab: am 9bcb0fcc: Merge "Recursively delete directories in handleAftermath()." 
* commit 'efb71f442c6dbdb75113d29df49106217f22cea3':
  Recursively delete directories in handleAftermath().
 2015-08-18 22:46:26 +00:00
Tao Bao
efb71f442c am 2e3746ab: am 9bcb0fcc: Merge "Recursively delete directories in handleAftermath()." 
* commit '2e3746abc7d70dd72f60a7912cd45472f3032acb':
  Recursively delete directories in handleAftermath().
 2015-08-18 22:41:34 +00:00
Chong Zhang
5dcb275cc1 Restore recent task to freeform space when resizing 
bug: 22984782
Change-Id: I95b7b7b4871865102a279e529f068479e9b5df34
 2015-08-18 15:28:54 -07:00
Wale Ogunwale
339e4155fb Merge "Added support for docked stack" 2015-08-18 21:23:46 +00:00
Tao Bao
5065e12dbe Recursively delete directories in handleAftermath(). 
RecoverySystem.handleAftermath() is called to clean up recovery-related
files. It needs to handle non-empty directories as well such as leftover
stashes from failed OTAs.

Bug: 23199081
Change-Id: I33fb326d376d04c793ad7b5948a10e8c1c572812
 2015-08-18 13:48:17 -07:00
Jim Miller
e0507bbbf9 Reset fingerprint lockout timer when strong auth is used. 
Fixes bug 22565462

Change-Id: I4842877839845e7fe103396d8ca8104928568c04
 2015-08-18 13:01:31 -07:00
Derek Sollenberger
4c5efe9290 Add ninePatch support to Canvas.h 
Change-Id: Ic095291fe55911c6501c1bdefa4b8da973c77319
 2015-08-18 15:32:57 -04:00
Alan Viverette
895615c363 Ensure layout resolution occurs when relative rules are removed 
Bug: 23295655
Change-Id: Ic46b018859c5af8cabf2fa0677e002de7cb6a996
 2015-08-18 14:51:48 -04:00
Wale Ogunwale
b34a7ad1af Added support for docked stack 
Docked stacks occupy a dedicated region on a display.
When a docked stack is present all other static stacks bounds
are restricted to the region of the screen not occupied by
the docked stack.

Change-Id: I6aec3aa19c41a7e756375002f3a925977b5533b5
 2015-08-18 11:31:20 -07:00
Xiaohui Chen
75f68ce1bd Clean up USER_OWNER in AccountManager 
Refactor copyAccountUser to take an explicit user handle instead of
hardcode to owner.  This requires refactoring one app that uses this
Api.

Bug: 19913735
Change-Id: Ib9b11d8155bea2a58974d09ec2d70bc756d46313
 2015-08-18 18:00:50 +00:00
Alan Viverette
d920ac6e6f Merge "Use correct param for heightMode in RelativeLayout horizontal measure" 2015-08-18 13:28:44 +00:00
John Reck
2fce18d99d Merge "Revert "Add ninePatch support to Canvas.h"" 2015-08-17 22:39:57 +00:00
Jorim Jaggi
69ca9960ac am faca9cbb: am 8787d8ef: am 73ef4642: am 581fd0fb: am 757e2c7f: Merge "Fix documentation issue" into mnc-dev 
* commit 'faca9cbbffb84683fa0f11ba14ae907ea872e6ce':
  Fix documentation issue
 2015-08-17 22:27:34 +00:00
John Reck
773bbe0357 Revert "Add ninePatch support to Canvas.h" 
This reverts commit edca320a2b.

Change-Id: I30ee93cfc1cac391ce152f03e9e13a1ad24dc91b
 2015-08-17 15:24:09 -07:00
Jorim Jaggi
faca9cbbff am 8787d8ef: am 73ef4642: am 581fd0fb: am 757e2c7f: Merge "Fix documentation issue" into mnc-dev 
* commit '8787d8ef01205e8b16cc7fa98b9b95af326fcffc':
  Fix documentation issue
 2015-08-17 22:20:21 +00:00