drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
230,922 Commits 1 Branch 0 Tags
Commit Graph

230922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clara Bayarri
d1f722d906 Enable enrolling/authenticating a specific work profile. 
This change adds support for a separate profile-specific
fingerprint database. This is to be used together with the work
challenge.

Change-Id: I65b3a74a1c887def210d7a6da0b907138f58a5ba
 2016-01-26 11:37:48 +00:00
Przemyslaw Szczepaniak
6cfdf6b67a Merge "Fix incorrect @hide usage in libcore" am: 1f3aaf82cb 
am: 04785955b5

* commit '04785955b5be7dc1ba164a0ae02c306b4fdd680d':
  Fix incorrect @hide usage in libcore
 2016-01-26 10:52:08 +00:00
Przemyslaw Szczepaniak
04785955b5 Merge "Fix incorrect @hide usage in libcore" 
am: 1f3aaf82cb

* commit '1f3aaf82cba11c55abc25b551e28344f04a1524a':
  Fix incorrect @hide usage in libcore
 2016-01-26 10:47:44 +00:00
Victor Chang
697815eddb Merge "Launch managed quick contacts without contact id" 2016-01-26 10:37:55 +00:00
Przemyslaw Szczepaniak
1f3aaf82cb Merge "Fix incorrect @hide usage in libcore" 2016-01-26 10:37:47 +00:00
Przemyslaw Szczepaniak
02027ff589 Fix incorrect @hide usage in libcore 
@hide annotation is only effective in Javadoc.

Bug: 26689841
Change-Id: I6e924b7452423b25d7258bb174e5b1601302c907
(cherry picked from commit a0dda9ca9d69fdeff620c7986375589e2a4d8c42)
 2016-01-26 10:35:22 +00:00
Narayan Kamath
d307a704f8 Revert "Update test-current.txt to fix build break." 
This reverts commit 7123cbd7374c37ffc88c2ffe1983b60e5f39a82c.
 2016-01-26 10:04:12 +00:00
Alan Treadway
44a1808154 Merge "Add explicit and persistent user provisioning state." 2016-01-26 09:59:40 +00:00
Benjamin Franz
6563025006 Merge "Add SmallTest annotation to DevicePolicyManagerTest" 2016-01-26 09:52:56 +00:00
Benjamin Franz
6d00903727 Add SmallTest annotation to DevicePolicyManagerTest 
Adding this annotation makes sure that the tests get picked up by
continuous integration tests.

Change-Id: Ia9166898803dd0037f6bb20cb6a12333ed347fd3
 2016-01-26 09:49:51 +00:00
Narayan Kamath
ac044909f5 Merge "Revert "Cellinfo: Update to version 12"" into mm-wireless-dev 
am: c980eca638

* commit 'c980eca638e549be342f99ba2bd6f27ada184736':
  Revert "Cellinfo: Update to version 12"
 2016-01-26 09:49:20 +00:00
Narayan Kamath
c980eca638 Merge "Revert "Cellinfo: Update to version 12"" into mm-wireless-dev 2016-01-26 09:46:14 +00:00
Narayan Kamath
d44d16f700 Revert "Cellinfo: Update to version 12" 
This reverts commit aa2be45a560b37c5249600667ee36a9f156515c2.

Change-Id: I5cc76b15b311e47bc5a892704930d218c9f72b0d
 2016-01-26 09:44:54 +00:00
Tomasz Mikolajewski
165e2849ff Unhide DocumentsContract.copyDocument and moveDocument. 
Change-Id: I304e4219ac679b9da88d785529f946dac058bbff
 2016-01-26 08:06:46 +00:00
Tomasz Mikolajewski
5eb8f9cc70 Merge "Add support for multi-parents to DocumentsProvider::moveDocument." 2016-01-26 08:03:19 +00:00
Tomasz Mikolajewski
d46ecbcc53 Add support for multi-parents to DocumentsProvider::moveDocument. 
Bug: 26481380
Change-Id: I96290268fd49072a334bde9c04c5313de8540f56
 2016-01-26 17:02:22 +09:00
Daichi Hirono
a4d207cf64 Merge "Fix bugs that prevent from using AppFuse." 2016-01-26 07:51:49 +00:00
Daichi Hirono
b36b15586a Fix bugs that prevent from using AppFuse. 
* Allow buffer size that is greater than requested read size in JNI,
   because we reuse fixed-size buffer among multiple requests.
 * Fix condition to check if the file size is greater than 4GB or
   not. We need to use 0xffffffffl instead of 0xffffffff because
   0xffffffff is int and its value is -1.

BUG=None
Change-Id: I155916e139353b15dc1ab535234faf50d942996d
 2016-01-26 16:30:08 +09:00
Adam Lesinski
a68cf3c4a7 Merge "AAPT2: Add -x and -z flags to minimize changes in build scripts" 2016-01-26 06:51:42 +00:00
Adam Lesinski
8900aa8b44 AAPT2: Add -x and -z flags to minimize changes in build scripts 
The -z flag will be supported soon anyway and -x is legacy.

Change-Id: I710467d35066d267dea8dfe7c521737fc768ede9
 2016-01-25 22:48:15 -08:00
Tomasz Mikolajewski
b7cf50cb95 Merge "Remove retry logic from DocumentsUI." 2016-01-26 04:52:59 +00:00
Tomasz Mikolajewski
ec7e7a9949 Merge "Enabled content validation in file ops tests." 2016-01-26 04:51:31 +00:00
Jae Seo
533b345682 TIF: Make TvInputService.onCreateRecordingSession a non-abstract method 
Change-Id: I1ecf5d2f66825fa9e87fd743d9d293d8bd395fce
 2016-01-25 20:34:12 -08:00
Vinit Deshpande
cb90cfbe16 Remove older passpoint code that we never made to work 
Since we are hiding MO trees et al; there is no reason to
keep this code anymore.

Change-Id: Ic92131b5949c3b97b7a55fa7d3e0cd8f9e933aa0
 2016-01-25 20:15:25 -08:00
Jeremy Klein
15f3d21599 Implement ui-based provisioning for the new tether api. 
This is dependent on ag/850648 and the Settings changes under the
uiprovisioning topic id.

BUG: 26247383
Change-Id: Ib151d56a1ece5ca3a55219abed965286eac5dd60
 2016-01-25 20:02:48 -08:00
Jeremy Klein
0301cd9523 Merge "Expose a simple tethering API which includes provision checks." 2016-01-26 03:59:51 +00:00
Roozbeh Pournader
834641b390 Move locale negotiation to ResourcesManager 
Previously, locale resolution happened at Resources level, which
could result in different Resources in the same app using different
locales.

This change moves the locale negotiation to ResourcesManager, which
remembers the locales supported by each Resources as they are
created, and negotiates the locale based on their union.

It also makes sure that the old model of apps getting the default
locale by accessing it through the Configuration's locale attribute
continues to work, since the negotiated locale will be moved to the
top of the list before Resources are created and when they are
updated with a Configuration change.

Bug: 25800576
Bug: 26404653
Change-Id: I0dd81df288327fd8d1229188c9544ee2209c161a
 2016-01-25 19:23:38 -08:00
Jorim Jaggi
50cd6361d7 Refine divider behavior 
- Switch earlier to the dismissing/fullscreen layout, so
we minimize holes.
- For the bottom/right one, switch also earlier to the larger size to
minimize holes. We can't do this for the upper one because it will be
confusing there if the layout bounds doesn't equal the bounds while
snapping.

Change-Id: I8f065514f7aaa15ae76af648794ab8b23302e534
 2016-01-26 03:19:15 +00:00
Wei Liu
8ab7759567 Add a null check before reference networkInfo. am: b8eaf45e1d am: dca8f10031 am: a12d383117 
am: 21e0927b47

* commit '21e0927b474a686d5827e059476291370c0b306e':
  Add a null check before reference networkInfo.
 2016-01-26 03:16:28 +00:00
Ian Pedowitz
2260a61842 Fix build and reorder methods to match ec6a447c86b03f5896fdb717de530c8abf8887f9 
Change-Id: I39ee2864eda489bf0e485ea96d30e56b29500865
 2016-01-25 19:09:42 -08:00
Wei Liu
21e0927b47 Add a null check before reference networkInfo. am: b8eaf45e1d am: dca8f10031 
am: a12d383117

* commit 'a12d3831178616a171382f1546812c26245af2d0':
  Add a null check before reference networkInfo.
 2016-01-26 03:06:09 +00:00
Steve McKay
2ed9f813b0 Enabled content validation in file ops tests. 
Authority isn't set by default. Wrapped in RootCursorWrapper.

Bug: 26687509
Change-Id: Ie99dbd799914f03bf7beac540b64df67c1e637a6
 2016-01-25 19:01:38 -08:00
Filip Gruszczynski
3236fef5d7 Merge "Fix build." 2016-01-26 02:30:51 +00:00
Filip Gruszczynski
0a66b6bc92 Fix build. 
Change-Id: I68d6fade1b2a44a3542182914e0cd5853f4f0a81
 2016-01-25 18:25:28 -08:00
Wei Liu
a12d383117 Add a null check before reference networkInfo. am: b8eaf45e1d 
am: dca8f10031

* commit 'dca8f10031f33c7c85577fa1abcc26d560c90388':
  Add a null check before reference networkInfo.
 2016-01-26 01:57:31 +00:00
Wei Liu
dca8f10031 Add a null check before reference networkInfo. 
am: b8eaf45e1d

* commit 'b8eaf45e1df007fc4f5a11bb58491abaef39cd57':
  Add a null check before reference networkInfo.
 2016-01-26 01:52:12 +00:00
Vladislav Kaznacheev
767c118a64 Merge "Add xhdpi resources for large mouse pointers" 2016-01-26 01:51:38 +00:00
Keisuke Kuroyanagi
0837daa464 Merge "Make scroll bar mouse draggable." 2016-01-26 01:46:53 +00:00
Vladislav Kaznacheev
2cd0e8e070 Add xhdpi resources for large mouse pointers 
Bug: 25778857
Change-Id: I4009bb63afd6269f93b2e06982106d2011228210
 2016-01-25 17:41:59 -08:00
Jae Seo
9df90a5ab6 Merge "TIF: Recording API" 2016-01-26 01:39:05 +00:00
Stephen Hines
446438299a Merge "Update test-current.txt to fix build break." 2016-01-26 01:29:13 +00:00
Nathan Harold
ec1d600153 Make DcRtInfo Power State Constants Final 
Bug: 26779884
Change-Id: Ia035b67fd682adb6542d6569d7634678f68a1e30
 2016-01-25 17:29:10 -08:00
Miao Wang
a11c28589e Merge "[RenderScript] Add API to map Allocation mallocptr to Java ByteBuffer" am: ed50f333fb 
am: 5f210ae042

* commit '5f210ae04239f4a374763ea9ffe7176f5455017a':
  [RenderScript] Add API to map Allocation mallocptr to Java ByteBuffer
 2016-01-26 01:27:30 +00:00
Keisuke Kuroyanagi
dfea1a3336 Merge "TextView: start drag and drop when dragging selection by mouse." 2016-01-26 01:26:06 +00:00
Keisuke Kuroyanagi
a2756f6018 Merge "TextView tests: drag and drop." 2016-01-26 01:26:06 +00:00
Stephen Hines
7123cbd737 Update test-current.txt to fix build break. 
Change-Id: Ie61fae56ac22f1d028b0de3f8688f626eb2ddacc
 2016-01-25 17:25:55 -08:00
Miao Wang
5f210ae042 Merge "[RenderScript] Add API to map Allocation mallocptr to Java ByteBuffer" 
am: ed50f333fb

* commit 'ed50f333fb28905f085473d3150f906f0106295a':
  [RenderScript] Add API to map Allocation mallocptr to Java ByteBuffer
 2016-01-26 01:21:51 +00:00
Miao Wang
ed50f333fb Merge "[RenderScript] Add API to map Allocation mallocptr to Java ByteBuffer" 2016-01-26 01:11:41 +00:00
Kweku Adams
8de29ca4f3 Fixing typo in ApplicationInfo documentation. 
Change-Id: I6d1d2e5d8bdfefa5ac28e3be46cca78b3a4b09e7
 2016-01-26 00:55:52 +00:00
Jeremy Klein
36c7aa0325 Expose a simple tethering API which includes provision checks. 
This CL exposes startTethering and stopTethering functions which also
encapsulate all provisioning check logic. Right now, only silent checks
are implemented, but UI checks will come in a follow-up CL. GTS tests
and Settings changes are under the same topic ID.

BUG: 26247383
Change-Id: I65f61d899594cb3f9035d8496366af17a57a090f
 2016-01-25 16:37:09 -08:00