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

52137 Commits

Author SHA1 Message Date
Fyodor Kupolov
3a22ad0ac4 am 09dbd46a: am 037281d4: am 563f974d: am d7cdbd4d: am e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev 
* commit '09dbd46af8faa60419a97e926463dc25fbd0513f':
  Fixed a typo in convertRestrictionsToBundle JavaDoc
 2015-08-22 01:22:32 +00:00
Jim Miller
c7506b3718 am e271d91e: am 7225af94: am c66a0db2: am 1bbc2750: am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev 
* commit 'e271d91e5f4a3941b654d41c87cb88f812a5d711':
  Fix type-o in FingerprintManager documentation
 2015-08-22 01:22:18 +00:00
Adrian Roos
e3b07451c3 resolved conflicts for merge of bcc26c02 to master 
Change-Id: I4260ff0d090cfa9741fd3adcfcadcbbff6839388
 2015-08-21 18:08:58 -07:00
Fyodor Kupolov
09dbd46af8 am 037281d4: am 563f974d: am d7cdbd4d: am e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev 
* commit '037281d4a9a22fa55b643e785ff32144cfa61591':
  Fixed a typo in convertRestrictionsToBundle JavaDoc
 2015-08-22 00:41:08 +00:00
Jim Miller
e271d91e5f am 7225af94: am c66a0db2: am 1bbc2750: am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev 
* commit '7225af947233f506d40500ab30a8c93bd1a603a5':
  Fix type-o in FingerprintManager documentation
 2015-08-22 00:40:58 +00:00
Adrian Roos
bcc26c0201 am 69fd61cb: am a8bbebd4: am b5e47228: Add StrongAuthTracker 
* commit '69fd61cb9a487e5993098c93113d86c4fb32c304':
  Add StrongAuthTracker
 2015-08-22 00:40:47 +00:00
Fyodor Kupolov
563f974d97 am d7cdbd4d: am e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev 
* commit 'd7cdbd4d812f3d3501c37b7242a7038298c7ee14':
  Fixed a typo in convertRestrictionsToBundle JavaDoc
 2015-08-22 00:17:44 +00:00
Jim Miller
c66a0db280 am 1bbc2750: am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev 
* commit '1bbc2750bb58f397a0195540d50c44400c381441':
  Fix type-o in FingerprintManager documentation
 2015-08-22 00:17:22 +00:00
Adrian Roos
a8bbebd426 am b5e47228: Add StrongAuthTracker 
* commit 'b5e4722891e7bbf2fffcd995af02838667a3abab':
  Add StrongAuthTracker
 2015-08-22 00:16:48 +00:00
Fyodor Kupolov
d7cdbd4d81 am e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev 
* commit 'e6c64508aba566b5bd4ac9cd87a07358b13f5a06':
  Fixed a typo in convertRestrictionsToBundle JavaDoc
 2015-08-21 23:12:43 +00:00
Fyodor Kupolov
e6c64508ab Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev 2015-08-21 23:04:09 +00:00
Jim Miller
1bbc2750bb am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev 
* commit '74d9c2aad1bcd52933a8dba7752b28e9aef1902d':
  Fix type-o in FingerprintManager documentation
 2015-08-21 22:11:30 +00:00
Jim Miller
74d9c2aad1 Merge "Fix type-o in FingerprintManager documentation" into mnc-dev 2015-08-21 21:59:51 +00:00
Chris Craik
655c5d4c70 Merge "Revert "Revert "Simplify TextureView draw path""" 2015-08-21 20:28:46 +00:00
Adrian Roos
b5e4722891 Add StrongAuthTracker 
Bug: 22846469
Bug: 22115393
Change-Id: I6ef5322d02e540fc043e7f20d3aabf595ce7c224
 2015-08-21 13:28:00 -07:00
Roozbeh Pournader
4bae2038cd Merge "Cleanup android.text.TextUtils a little." 2015-08-21 19:04:29 +00:00
Fyodor Kupolov
7d35fc3898 Fixed a typo in convertRestrictionsToBundle JavaDoc 
Bug: 23408097
Change-Id: Ie06c33aa7b9a953dec645d1763e27dcb506764f0
 2015-08-21 11:25:55 -07:00
Chris Craik
3aadd60521 Revert "Revert "Simplify TextureView draw path"" 
Fixed build breakage

This reverts commit d35dcb1311.

Change-Id: Id3a103fbaac15a05f558bce2161ce17b6e8d2ea3
 2015-08-21 10:33:02 -07:00
Roozbeh Pournader
999da7464a Merge "Update tests and support negative values in formatBytes()." 2015-08-21 17:21:11 +00:00
Roozbeh Pournader
4059d7dbfa Update tests and support negative values in formatBytes(). 
This updates the tests to match the older commit
f723017481 and also adds support for
negative values.

Bug: 23191381
Bug: 11237727
Change-Id: Ib9a1f10031b730ee460658949b388c779cefa041
 2015-08-20 17:59:30 -07:00
Filip Gruszczynski
c12e6780e4 Merge "API for specifying size/gravity of launching activity." 2015-08-20 22:43:25 +00:00
Filip Gruszczynski
848fe6bef2 API for specifying size/gravity of launching activity. 
Change-Id: I4d75b3fa56ff9c35be9beeba81e3ec9ab28a9996
 2015-08-20 15:27:36 -07:00
Fyodor Kupolov
e67177d79a am 9125dbbf: am 1ffb592e: am 78985f3f: am ea57b592: am 1773ded8: Merge "Fixed key comparison in equals method" into mnc-dev 
* commit '9125dbbf932efafa7a86ddb3e45598f230a81952':
  Fixed key comparison in equals method
 2015-08-20 20:27:35 +00:00
Fyodor Kupolov
9125dbbf93 am 1ffb592e: am 78985f3f: am ea57b592: am 1773ded8: Merge "Fixed key comparison in equals method" into mnc-dev 
* commit '1ffb592e0b0bf68e2d1db13712dc1c9810507140':
  Fixed key comparison in equals method
 2015-08-20 20:19:36 +00:00
Fyodor Kupolov
78985f3fb5 am ea57b592: am 1773ded8: Merge "Fixed key comparison in equals method" into mnc-dev 
* commit 'ea57b59222571e7e82d8b628e86b4ff0bdbe3f49':
  Fixed key comparison in equals method
 2015-08-20 20:02:42 +00:00
Fyodor Kupolov
ea57b59222 am 1773ded8: Merge "Fixed key comparison in equals method" into mnc-dev 
* commit '1773ded84684593f459b19f3271d471b38f14f85':
  Fixed key comparison in equals method
 2015-08-20 19:53:29 +00:00
Fyodor Kupolov
1af7a83939 Fixed key comparison in equals method 
Bug: 23376695
Change-Id: Ie4bd55a88f5f86fd8de7b087d0a5f1755951e90d
 2015-08-20 10:24:14 -07:00
Xiaohui Chen
225c8387eb Merge changes I260758f1,Ib6c2ed11 
* changes:
  Clean up USER_OWNER reference in PMS
  Clean up USER_OWNER in notifications
 2015-08-20 17:03:53 +00:00
Nicolas Prévot
be8b98b939 Merge "Allow non-owner users to have managed profiles." 2015-08-20 14:48:18 +00:00
Nicolas Prevot
b818681dca Allow non-owner users to have managed profiles. 
In the split system user model:
The only users that are not allowed to have managed profiles are:
- purely system user (user 0)
- guest users
- restricted profiles
- managed profiles

In the non-split system user model, the behavior does not change:
only the primary user can have managed profiles.

BUG:22956426
Change-Id: If908c30f110fd3e740770174f050c9b6cf87ce1b
 2015-08-20 14:15:19 +01:00
Florian Salbrechter
30c3c09071 Merge "Fix wrong javadoc in BluetoothAdapter." 2015-08-20 09:29:29 +00:00
Jim Miller
5f69ca3be3 Fix type-o in FingerprintManager documentation 
Fixes bug 23274133

Change-Id: I15607d0e64c0b11d36d0e0d47ea88c42101e4dde
 2015-08-20 05:06:36 +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
Xiaohui Chen
ddbe4ca1ca Clean up USER_OWNER in notifications 
Bug: 19913735
Change-Id: Ib6c2ed11eee6adf062a6dff00c99e62945153f9e
 2015-08-19 14:09:21 -07:00