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

230779 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Bao
5adbfd0a44 Merge "Build update engine binder AIDLs for framework use." 2016-01-26 18:17:37 +00:00
Ben Kwa
bae1c3482c Merge "Temporarily fix directory tile heights in grid mode." 2016-01-26 18:11:44 +00:00
Ben Kwa
70921871ba Temporarily fix directory tile heights in grid mode. 
BUG=26760493

Change-Id: I118e30cdf3892ef6857735f4a4f69a128b3f1c36
 2016-01-26 10:08:24 -08:00
John Reck
5f1c64ef76 Merge "Temporarily workaround merged bitmap bug" 2016-01-26 18:06:04 +00:00
Shishir Agrawal
9457a20dd5 Merge "DO NOT MERGE : Unhiding MSIM APIs." into mm-wireless-dev 
am: 45836d13e5  -s ours

* commit '45836d13e5d06c787b5039894b6c0ac7c5eb7b7b':
  DO NOT MERGE : Unhiding MSIM APIs.
 2016-01-26 18:04:39 +00:00
Shishir Agrawal
45836d13e5 Merge "DO NOT MERGE : Unhiding MSIM APIs." into mm-wireless-dev 2016-01-26 18:00:11 +00:00
Adrian Roos
ebefdd3f7c Merge "Crash dialog improvements, move crash code to AppErrors" 2016-01-26 17:42:09 +00:00
Shishir Agrawal
3a86d3d534 DO NOT MERGE : Unhiding MSIM APIs. 
1. Unhide MSIM APIs in TelephonyManager that already have non-MSIM equivalent
   APIs public.
2. Make MSIM API naming consistent (overloaded, no suffix).
3. Unhide APIs in SubscriptionManager that are necessary for MSIM.

Bug: 26772894
Change-Id: Ibebab7379ea79c8e4812bbd190342827048e30e2
 2016-01-26 09:29:24 -08:00
Wale Ogunwale
5407f1e652 Merge "Revert "Relaunch activity resumed if it got resumed before relaunching."" 2016-01-26 17:17:21 +00:00
Adrian Roos
20d7df3c3f Crash dialog improvements, move crash code to AppErrors 
Factors out the crash and ANR handling code into separate
class and allows clearing cache and restarting app from
crash dialog.

Bug: 22692162
Change-Id: I2a08a4255ea02ab3c7441d351bf278128fcf5a5d
 2016-01-26 09:16:26 -08:00
Wale Ogunwale
32ebbd87d7 Revert "Relaunch activity resumed if it got resumed before relaunching." 
This reverts commit 51dc8be2230758132744ae6204d95e8171784c26.

Due to activities getting multiple resume calls.

Bug: 26116905
Bug: 25674611
Change-Id: Idb4846b6a0efc4d6ac06bf240565f303d9206f0f
 2016-01-26 09:13:24 -08:00
John Reck
14de0415bb Temporarily workaround merged bitmap bug 
Bug: 26569206

Merged bitmap ops are buggy, just turn them off for
now to unblock testing

Change-Id: Ic0151bb3f23b1843107806659a64b26fd6d6e19e
 2016-01-26 09:01:30 -08:00
Florin Malita
dd93728b46 Merge "Add internal Canvas save flags" 2016-01-26 17:00:37 +00:00
Jason Monk
8dfd95d091 Merge "Add user switcher back to QS" 2016-01-26 16:07:55 +00:00
Jason Monk
69e76ccee7 Add user switcher back to QS 
Change-Id: Ie3f8139782aee06ad932ded9145162de5e22a824
 2016-01-26 11:03:16 -05:00
Andrei Stingaceanu
4ccec532d7 Hide suspended apps from recents 
* Introduce a new boolean realActivitySuspended in TaskRecord to
keep track of the suspended state (this also makes sure the
information is persisted across reboots).
* Introduce a new method onPackagesSuspendedChanged
in RecentTasks which flips the realActivitySuspended for each
TaskRecord for the desired user and packages sent
* Register a new broadcast receiver (for SUSPEND/UNSUSPEND)
in ActivityManager#finishBooting which calls
RecentTasks#markPackagesSuspendedStateForUser
* In ActivityManagerService#getRecentTasks filter out
Taskrecords for suspended apps by checking realActivitySuspended

Bug: 22776761
Change-Id: I52e3593ccb2dae223d1ea11d017a6b1626646639
 2016-01-26 16:01:30 +00:00
Clara Bayarri
de32f98b5b Merge "Enable enrolling/authenticating a specific work profile." 2016-01-26 15:51:26 +00:00
John Reck
c52ac0b9e2 Merge "Add fine-grained debug layer" 2016-01-26 15:21:07 +00:00
Jason Monk
37e65a409f Merge "Only show settings drawer on top level items" 2016-01-26 14:46:02 +00:00
Sudheer Shanka
1b92aefaae Merge "Add support for adding preference summary when disabled by admin." 2016-01-26 14:42:04 +00:00
Sudheer Shanka
2d4e09750d Merge "Check for null condition in case there is no DPM support." 2016-01-26 14:29:29 +00:00
Sudheer Shanka
c61087106e Check for null condition in case there is no DPM support. 
Change-Id: Ie7c70737d0c36ae9efd1920498d9f07b8a7016b1
 2016-01-26 14:00:16 +00:00
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
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