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

237135 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
94a62b131e Merge "Start unaware persistent apps after user unlocked." into nyc-dev 
am: ab37f0f832

* commit 'ab37f0f8325658aadf9170571c738914d3f8d674':
  Start unaware persistent apps after user unlocked.
 2016-03-02 02:36:52 +00:00
Vadim Tryshev
744ed05715 Merge "Revert "Adding getManagedUserBadgedDrawableForDensity() to PackageManager."" into nyc-dev 
am: 791d078d0b

* commit '791d078d0bdcd5f10f4aa928afc4dda8086e4129':
  Revert "Adding getManagedUserBadgedDrawableForDensity() to PackageManager."
 2016-03-02 02:35:03 +00:00
Insun Kang
af79855f84 Merge "Annotate Media section of framework/base" into nyc-dev 
am: 542221d68a

* commit '542221d68afe424da3821c9ae87dc62a5a5fac5a':
  Annotate Media section of framework/base
 2016-03-02 02:33:23 +00:00
Steve McKay
c3cfd763a9 Merge "Fix roots filtering for move operations." into nyc-dev 
am: de5ec832b1

* commit 'de5ec832b10b155d1d61de4eedb5171da3a76a9c':
  Fix roots filtering for move operations.
 2016-03-02 02:31:41 +00:00
Jeff Sharkey
c53962d4ed When system server goes down, crash apps more. 
Apps making calls into the system server may end up persisting
internal state or making security decisions based on the perceived
success or failure of a call, or the default values returned.

The reality is that if the system process just died, init will be
along shortly to kill all running apps, so we should have no problem
rethrowing the RemoteException as a RuntimeException.

Bug: 27364859
Change-Id: Ife0bcb079636c88d54c44d17eb580409fd79028b
 2016-03-01 19:29:16 -07:00
Keun-young Park
078f9b9813 Revert "Revert "make isUiModeLocked, isNightModeLocked test api"" 
This reverts commit 92373d23ee13a3d017ee8570229eed164935cd35.

Change-Id: Idf0c3f1d3bed522142f8af3526effe813664d89f
 2016-03-02 02:18:19 +00:00
Robin Lee
73d9f95ada Merge "More sensible return code for Credentials.deleteAll" into nyc-dev am: ff3c66b352 
am: f842f8a7ed

* commit 'f842f8a7ed967c9dfc17e8a34869858f82f66625':
  More sensible return code for Credentials.deleteAll
 2016-03-02 02:06:58 +00:00
Selim Cinek
bf964bb1aa Fixed a bug where the notification texts wouldn\'t animate 
am: 049f6adfb8

* commit '049f6adfb8fea4622af5cd3247514ec7a461bf46':
  Fixed a bug where the notification texts wouldn't animate
 2016-03-02 02:04:00 +00:00
Jason Monk
0ad4d8bea7 Merge "Fix difference in icon size for quick QS" into nyc-dev am: bbcdab6f01 
am: 2415bc4f0b

* commit '2415bc4f0b84e9622f6ad99d2ef324059957f7ac':
  Fix difference in icon size for quick QS
 2016-03-02 02:03:24 +00:00
Jeff Sharkey
e37ee97871 Merge "Don\'t evict SharedPreferences when migrate no-op." into nyc-dev 
am: 19c7699309

* commit '19c7699309f7aa6ce487a8db353ea24acf94c4ca':
  Don't evict SharedPreferences when migrate no-op.
 2016-03-02 02:02:05 +00:00
Robin Lee
60a967964d Merge "ConnectivityService: listen to USER_UNLOCKED too" into nyc-dev am: 2f4286b792 
am: fc46e9e4ca

* commit 'fc46e9e4caf6c0dfe0b6f905a06c2d2b132d8173':
  ConnectivityService: listen to USER_UNLOCKED too
 2016-03-02 02:00:05 +00:00
Jeff Sharkey
a4681f0300 Merge "Make preferred activities encryption aware." into nyc-dev 
am: 8b609f3a96

* commit '8b609f3a96f9576c258ffd38cea2853cd2129ebf':
  Make preferred activities encryption aware.
 2016-03-02 01:59:44 +00:00
Jeff Sharkey
0b37afa7b0 Merge "Utility to detect lock inversions in system." into nyc-dev 
am: 8e28443aa7

* commit '8e28443aa7263d4d7a78f39fab32176505e3506d':
  Utility to detect lock inversions in system.
 2016-03-02 01:57:52 +00:00
Jakub Pawlowski
76033a5638 Merge "Hide android.bluetooth.OobData" into nyc-dev am: ecc873d5ee 
am: 9a622515b7

* commit '9a622515b785e618bab204839b702628104beb74':
  Hide android.bluetooth.OobData
 2016-03-02 01:57:23 +00:00
Vadim Tryshev
b23ebe99a8 Merge "Adding getManagedUserBadgedDrawableForDensity() to PackageManager." into nyc-dev 
am: 6b1eb711d4

* commit '6b1eb711d443242e41f8f81580fcfe336a131aa2':
  Adding getManagedUserBadgedDrawableForDensity() to PackageManager.
 2016-03-02 01:56:00 +00:00
Jeff Sharkey
ab37f0f832 Merge "Start unaware persistent apps after user unlocked." into nyc-dev 2016-03-02 01:54:12 +00:00
Adrian Roos
9c6888663c Merge "Improve mergeability of metrics_constants.proto" into nyc-dev am: eca23784db 
am: 39f8659d24

* commit '39f8659d2423b99a9136fe706fdf7b1b5a1a9c97':
  Improve mergeability of metrics_constants.proto
 2016-03-02 01:54:02 +00:00
Filip Gruszczynski
641da7834e Merge "Relaunch activity resumed if it got resumed before relaunching." into nyc-dev 
am: 75f5de62fe

* commit '75f5de62fe4f7b529e51c6f3181483ed574cbd58':
  Relaunch activity resumed if it got resumed before relaunching.
 2016-03-02 01:52:53 +00:00
Vadim Tryshev
791d078d0b Merge "Revert "Adding getManagedUserBadgedDrawableForDensity() to PackageManager."" into nyc-dev 2016-03-02 01:52:19 +00:00
Vadim Tryshev
093622f089 Revert "Adding getManagedUserBadgedDrawableForDensity() to PackageManager." 
This reverts commit 9f68f41a5866e1feb810b16c769705c10e850d5d.

Caused breakage.

Change-Id: I441737f61f6f38ed9f440211b52bbac0f74982e3
 2016-03-02 01:51:42 +00:00
Jeff Sharkey
d6a632bd2e Merge "Sometimes to step forward, we need to go back. [2/2]" into nyc-dev 
am: 85f2ded23e

* commit '85f2ded23e0e77678f606dfa3ea4536d71c6edd2':
  Sometimes to step forward, we need to go back. [2/2]
 2016-03-02 01:50:25 +00:00
Winson
7cd810ca06 Fixing regression in creating dismiss descriptions. am: 9da1885047 
am: 595e294628

* commit '595e294628c34d44ad9f2c7e17543590b4de0d8a':
  Fixing regression in creating dismiss descriptions.
 2016-03-02 01:50:20 +00:00
Jeff Sharkey
24f4adb70f Merge "Sometimes to step forward, we need to go back. [1/2]" into nyc-dev 
am: 888de830ed

* commit '888de830edd037118e9f3a864e5930f2c7defa3c':
  Sometimes to step forward, we need to go back. [1/2]
 2016-03-02 01:48:30 +00:00
Winson
c0a08b8013 Merge "Skip animation in error case, log for further investigation." into nyc-dev am: 6b03ff8d57 
am: c331564972

* commit 'c331564972670686d8b8ef08029e0baca4d2cf31':
  Skip animation in error case, log for further investigation.
 2016-03-02 01:46:54 +00:00
Yigit Boyar
82036dbe65 Merge "Check if item is selectable before calling on click" into nyc-dev 
am: 5ae74b7fa6

* commit '5ae74b7fa6f962d2732c32b3cd4c180ae58fd866':
  Check if item is selectable before calling on click
 2016-03-02 01:44:50 +00:00
Abhijith Shastry
0afec78578 Merge "Add deprecated annotation to launchManageBlockedNumbersActivity API." into nyc-dev am: 35293d2ff7 
am: 2d54a7e49c

* commit '2d54a7e49c734b7c2d7911fd98504fa46ad8d101':
  Add deprecated annotation to launchManageBlockedNumbersActivity API.
 2016-03-02 01:43:15 +00:00
Lorenzo Colitti
752837ac79 Merge "Don\'t pass calling contexts into static services." into nyc-dev 
am: 7f2b6e2a84

* commit '7f2b6e2a8492d2b751f1695a747aef5f53d30d8c':
  Don't pass calling contexts into static services.
 2016-03-02 01:42:55 +00:00
John Reck
2df2f02de9 Merge "Revert "Temporarily disable AVD on RT"" into nyc-dev 
am: d25d2f5346

* commit 'd25d2f5346d0f4e89c09bd45978bf4c96399d947':
  Revert "Temporarily disable AVD on RT"
 2016-03-02 01:41:06 +00:00
Jeff Sharkey
68b7c1c87f Merge "Suppress StopInfo exception based on target API." into nyc-dev am: d1caf8560d 
am: cfc7bc8137

* commit 'cfc7bc8137ad512e032a9e72be312f7d807efe6b':
  Suppress StopInfo exception based on target API.
 2016-03-02 01:40:39 +00:00
John Reck
ba6eed8946 Merge "Temporarily disable AVD on RT" into nyc-dev 
am: 212cc4ebfa

* commit '212cc4ebfa1129da63c43116c863e6a7d0ca7aa2':
  Temporarily disable AVD on RT
 2016-03-02 01:39:06 +00:00
Jeff Sharkey
f7d47f91fe Start unaware persistent apps after user unlocked. 
Otherwise we'll never start them.  In particular, this fixes NFC.

Bug: 27360562
Change-Id: I9d430b1e377e63b35060b234f585ac180a369ad2
 2016-03-01 18:38:55 -07:00
Chris Wren
2b709a7f01 Merge "add all those great comments from the other file." into nyc-dev am: f3179cf56a 
am: 46e39cfd7c  -s ours

* commit '46e39cfd7c728f72aef73330bcbb7bf8067577a7':
  add all those great comments from the other file.
 2016-03-02 01:37:30 +00:00
Insun Kang
542221d68a Merge "Annotate Media section of framework/base" into nyc-dev 2016-03-02 01:36:10 +00:00
Steve McKay
de5ec832b1 Merge "Fix roots filtering for move operations." into nyc-dev 2016-03-02 01:33:33 +00:00
Steve McKay
ea9ec291ed Fix roots filtering for move operations. 
Add test coverage for the Downloads case.
This was a regression to my recent cleanup of RootInfo.
Fixed logic to not exclude basically *everything* when a
    directory is in the set of files to be copied.

Bug: 27303346
Change-Id: I4d5608e0d8d95448b027b20107a11a7a5e46d45e
 2016-03-02 01:32:30 +00:00
Selim Cinek
049f6adfb8 Fixed a bug where the notification texts wouldn't animate 
If the texts were the same but one had an ellipsis and the
other didn't, things were not animating nicely.

Bug: 27419215
Change-Id: Iaa9611e1cf60b6fe71113b76f36ab5c24e461961
 2016-03-02 01:21:26 +00:00
Jeff Sharkey
19c7699309 Merge "Don't evict SharedPreferences when migrate no-op." into nyc-dev 2016-03-02 00:53:13 +00:00
Jeff Sharkey
8b609f3a96 Merge "Make preferred activities encryption aware." into nyc-dev 2016-03-02 00:52:35 +00:00
Jeff Sharkey
8e28443aa7 Merge "Utility to detect lock inversions in system." into nyc-dev 2016-03-02 00:52:21 +00:00
Vadim Tryshev
6b1eb711d4 Merge "Adding getManagedUserBadgedDrawableForDensity() to PackageManager." into nyc-dev 2016-03-02 00:49:32 +00:00
Wale Ogunwale
75f5de62fe Merge "Relaunch activity resumed if it got resumed before relaunching." into nyc-dev 2016-03-02 00:45:04 +00:00
Vadim Tryshev
9f68f41a58 Adding getManagedUserBadgedDrawableForDensity() to PackageManager. 
It allows badging an image regardless of of the user (no
user id parameter). The styling for managed users is applied.

This is useful for new cases where the existing functions
wouldn't badge the icon, but we need it.

Bug: 25192539
Change-Id: I20ca2d7265cbc3a47c050a72ec1843cc0a481c74
 2016-03-02 00:41:26 +00:00
Jeff Sharkey
85f2ded23e Merge "Sometimes to step forward, we need to go back. [2/2]" into nyc-dev 2016-03-02 00:38:41 +00:00
Jeff Sharkey
888de830ed Merge "Sometimes to step forward, we need to go back. [1/2]" into nyc-dev 2016-03-02 00:38:33 +00:00
Yigit Boyar
5ae74b7fa6 Merge "Check if item is selectable before calling on click" into nyc-dev 2016-03-02 00:36:50 +00:00
Jeff Sharkey
fa6a1bc755 Sometimes to step forward, we need to go back. [2/2] 
Change-Id: Iccabb95530a6e3c3950cb9a8dfe84e75354d2f5f
 2016-03-01 17:36:23 -07:00
Lorenzo Colitti
7f2b6e2a84 Merge "Don't pass calling contexts into static services." into nyc-dev 2016-03-02 00:33:42 +00:00
Jeff Sharkey
9ad443f59c Sometimes to step forward, we need to go back. [1/2] 
Change-Id: Ibff95298dc2e6c09675018ad0c45506589b6312a
 2016-03-01 17:28:36 -07:00
Yigit Boyar
418d0cf5c9 Check if item is selectable before calling on click 
This CL fixes a bug in ListView where it might call onClick on an
un-clickable if a new touch arrives before up timeout.

We could actually consider making child position non-changable
but that will change behavior. This seems safer approach.

Bug: 27198796
Change-Id: I7b15d04efa19d1d760a294bd027f3da3aaa3a445
 2016-03-01 16:09:58 -08:00
Doris Liu
d25d2f5346 Merge "Revert "Temporarily disable AVD on RT"" into nyc-dev 2016-03-02 00:08:31 +00:00