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

236986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
2a849f0de2 Merge "Utility to detect lock inversions in system." into nyc-dev am: 8e28443aa7 
am: 0b37afa7b0

* commit '0b37afa7b0266b2adc7b7100fe3165ecf82dc29c':
  Utility to detect lock inversions in system.
 2016-03-02 06:35:04 +00:00
Vadim Tryshev
3c597665e7 Merge "Adding getManagedUserBadgedDrawableForDensity() to PackageManager." into nyc-dev am: 6b1eb711d4 
am: b23ebe99a8

* commit 'b23ebe99a80c4328cbccf1dda39419e362ed5ffa':
  Adding getManagedUserBadgedDrawableForDensity() to PackageManager.
 2016-03-02 06:32:47 +00:00
Filip Gruszczynski
1e32c6181d Merge "Relaunch activity resumed if it got resumed before relaunching." into nyc-dev am: 75f5de62fe 
am: 641da7834e

* commit '641da7834e01bd7d124826fbaac095a31b1a155d':
  Relaunch activity resumed if it got resumed before relaunching.
 2016-03-02 06:29:21 +00:00
Jeff Sharkey
308b9b3739 Merge "Sometimes to step forward, we need to go back. [2/2]" into nyc-dev am: 85f2ded23e 
am: d6a632bd2e

* commit 'd6a632bd2e1a06ad4b91388f66e440a829d5791e':
  Sometimes to step forward, we need to go back. [2/2]
 2016-03-02 06:26:58 +00:00
Jeff Sharkey
4ac7f0391e Merge "Sometimes to step forward, we need to go back. [1/2]" into nyc-dev am: 888de830ed 
am: 24f4adb70f

* commit '24f4adb70fb16a0d9e7a6ec784623c53881586cd':
  Sometimes to step forward, we need to go back. [1/2]
 2016-03-02 06:23:59 +00:00
Yigit Boyar
786f71ef01 Merge "Check if item is selectable before calling on click" into nyc-dev am: 5ae74b7fa6 
am: 82036dbe65

* commit '82036dbe6569c807500836d624e1187ed0bb2449':
  Check if item is selectable before calling on click
 2016-03-02 06:20:29 +00:00
Lorenzo Colitti
b6ee6967fe Merge "Don\'t pass calling contexts into static services." into nyc-dev am: 7f2b6e2a84 
am: 752837ac79

* commit '752837ac79f5fd1179fd9daa3ede1374c1afdae4':
  Don't pass calling contexts into static services.
 2016-03-02 06:18:12 +00:00
John Reck
dbae20052a Merge "Revert "Temporarily disable AVD on RT"" into nyc-dev am: d25d2f5346 
am: 2df2f02de9

* commit '2df2f02de97527c2c190f028d5d6bca1df5c2a1f':
  Revert "Temporarily disable AVD on RT"
 2016-03-02 06:14:45 +00:00
John Reck
d7921703b2 Merge "Temporarily disable AVD on RT" into nyc-dev am: 212cc4ebfa 
am: ba6eed8946

* commit 'ba6eed8946c611d7696ba4e996914d5eb6a8eb33':
  Temporarily disable AVD on RT
 2016-03-02 06:11:08 +00:00
Svetoslav Ganov
0a21d65d04 Merge "API for safe label to present in the UI" into nyc-dev am: 6cc1ba8e17 
am: d36d11f232

* commit 'd36d11f2323dbb28c3885b4a49ebc5b73712b35d':
  API for safe label to present in the UI
 2016-03-02 06:08:51 +00:00
Anna Galusza
acf9b1394f Merge "Throw exception from SoftKeyboardController if connection is dead and declare SHOW_MODE_AUTO and SHOW_MODE_HIDDEN in AccessibilityService class. Bug: 27364143" into nyc-dev am: 2e36a9e1c7 
am: e853ceb080

* commit 'e853ceb080df09bb22a3f8c28441a0d61068b0ce':
  Throw exception from SoftKeyboardController if connection is dead and declare SHOW_MODE_AUTO and SHOW_MODE_HIDDEN in AccessibilityService class. Bug: 27364143
 2016-03-02 06:06:18 +00:00
Fyodor Kupolov
3fa9f47147 Merge "Disable switching users if the user is in a call" into nyc-dev am: 285bec2641 
am: cef5ba5adc

* commit 'cef5ba5adc070e31fb1a568bd8c48b5d631f1cf4':
  Disable switching users if the user is in a call
 2016-03-02 06:03:15 +00:00
Alan Viverette
26daa2c7f6 Merge "Use Holo date/time picker layouts on very small screens" into nyc-dev am: 90ed1eca3e 
am: 80e6a6a696

* commit '80e6a6a6964c64073fc51b5b5655092132cdaaeb':
  Use Holo date/time picker layouts on very small screens
 2016-03-02 06:00:43 +00:00
Svetoslav Ganov
509e50ff0e Merge "Hide overlay windows in VR mode" into nyc-dev am: 2ab93cb22a 
am: cbac925c44

* commit 'cbac925c44f83a2f4314574c4ec0f5d0fc9f795a':
  Hide overlay windows in VR mode
 2016-03-02 05:58:09 +00:00
Keun-young Park
93f0d5d29c Merge "Revert "make isUiModeLocked, isNightModeLocked test api"" into nyc-dev am: 8486706aff 
am: 765415a766

* commit '765415a76624ce2e041ef814039bdb1693e3d2b8':
  Revert "make isUiModeLocked, isNightModeLocked test api"
 2016-03-02 05:55:09 +00:00
Felipe Leme
55c9a3ae83 Merge "Created netpolicy commands to manage UIDs blacklisted for network access while on background." into nyc-dev am: 2657492e5a 
am: 41411f5f09

* commit '41411f5f09e3610e05a349a11589264234ffd76e':
  Created netpolicy commands to manage UIDs blacklisted for network access while on background.
 2016-03-02 05:52:34 +00:00
Steve McKay
48953b3913 Merge "Ensure directory names are aligned correctly..." into nyc-dev am: d6689d99f7 
am: 2eb8bc2aca

* commit '2eb8bc2aca71e42551b002d1fd4099d7b7622a54':
  Ensure directory names are aligned correctly...
 2016-03-02 05:50:03 +00:00
Dongwon Kang
6886052d21 Merge "TIF: Address API review comments" into nyc-dev am: 9cd89a403e 
am: f6c9dc9594

* commit 'f6c9dc9594cf16c6e148498cabd793f8affa76e9':
  TIF: Address API review comments
 2016-03-02 05:46:59 +00:00
George Mount
35b8f81d50 Merge "Clear child fragment manager after it is destroyed." into nyc-dev am: f445f76eca 
am: af3b3b6213

* commit 'af3b3b621391c44d4330ca99947655322573effa':
  Clear child fragment manager after it is destroyed.
 2016-03-02 05:44:30 +00:00
George Mount
426bfb1e18 Merge "Ensure that fragments are created in added order." into nyc-dev am: b67d34f10e 
am: 3bbd384a6c

* commit '3bbd384a6cf70a34101eee3b8e64c7906fee1420':
  Ensure that fragments are created in added order.
 2016-03-02 05:42:05 +00:00
Steve McKay
b1c69486ce Merge "Don\'t assert against Recents title." into nyc-dev am: d511a090d2 
am: 567e4d0e5c

* commit '567e4d0e5c823be6eea76ce7908fbf9384720302':
  Don't assert against Recents title.
 2016-03-02 05:39:25 +00:00
Michael Wright
63913784e6 Merge "Show error message when pairing fails in SUW." into nyc-dev am: a75c2a7819 
am: c0f49f7e70

* commit 'c0f49f7e70f7529453ded0d5327fe611447b4471':
  Show error message when pairing fails in SUW.
 2016-03-02 05:36:45 +00:00
Chris Wren
e02cb70c18 Merge "Revert "add all those great comments from the other file."" into nyc-dev am: ccb7f018e6 
am: 7d8f4fcd80  -s ours

* commit '7d8f4fcd802ce43fecc134297b47de48784aea97':
  Revert "add all those great comments from the other file."
 2016-03-02 05:33:28 +00:00
Brian Carlstrom
21f30ba180 Merge "Merge "TIF: Address API review comments" into nyc-dev am: 9cd89a403e" 2016-03-02 05:06:12 +00:00
Dianne Hackborn
6a83b65d38 Merge "Fix issue #27317952: PendingIntent.getIntent() should be protected" into nyc-dev am: a6dcaa6f84 
am: ced889548b

* commit 'ced889548bb371bd08236499c850adfa7e021610':
  Fix issue #27317952: PendingIntent.getIntent() should be protected
 2016-03-02 05:05:49 +00:00
Todd Kennedy
1d67f35132 Merge "Revert "Revert "Remove deprecated methods / classes""" into nyc-dev am: 4f858aaa5a 
am: d509acbf45

* commit 'd509acbf45a5f9af931c50dc0e69cc99c876e648':
  Revert "Revert "Remove deprecated methods / classes""
 2016-03-02 05:03:03 +00:00
Wale Ogunwale
c1ddd80c93 Merge "Changed logging format of lost windows to reduce confusion." into nyc-dev am: 4722231184 
am: c05f92546c

* commit 'c05f92546c463e711032c4708eb7bcef5831d5ad':
  Changed logging format of lost windows to reduce confusion.
 2016-03-02 05:00:17 +00:00
Wale Ogunwale
60bf254e6d Merge "Add activity onStop lifecycle to event logs." into nyc-dev am: 6e66695777 
am: 54a45c2e1b

* commit '54a45c2e1b287e4714ffe8d007a8ae2c8394a17a':
  Add activity onStop lifecycle to event logs.
 2016-03-02 04:57:37 +00:00
Dongwon Kang
176facba14 Merge "TIF: Address API review comments" into nyc-dev 
am: 9cd89a403e

* commit '9cd89a403e60f6be665a6068be76b805c8b83402':
  TIF: Address API review comments

(cherry picked from commit f6c9dc9594cf16c6e148498cabd793f8affa76e9)
 2016-03-01 20:48:50 -08: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
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
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
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
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
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
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
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