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
Geoff Mendal
492ebd85a9 Import translations. DO NOT MERGE 
Change-Id: I290495e9a0b12c372f30904725ac1d5fad961042
Auto-generated-cl: translation import
 2016-03-02 08:25:51 -05:00
Geoff Mendal
f8d7211167 Import translations. DO NOT MERGE 
Change-Id: I671e94d18c2b904ab6df30551a559badc6fbc17b
Auto-generated-cl: translation import
 2016-03-02 05:21:09 -08:00
Nimrod Gileadi
727b62a028 Merge "Close InputStream in BatteryStatsHelper" into nyc-dev am: c14893bf5a 
am: a2f24a01f1

* commit 'a2f24a01f1d47888abde620cce003c9e11bd49f4':
  Close InputStream in BatteryStatsHelper
 2016-03-02 09:45:09 +00:00
Tomasz Mikolajewski
a9d74f30ad Merge "Fix DocumentUI\'s perf tests compile failure." into nyc-dev am: 0d26fdb6cd 
am: d191d076b8

* commit 'd191d076b8f94c9001044daf78b5ef1e8cfec0a7':
  Fix DocumentUI's perf tests compile failure.
 2016-03-02 09:26:32 +00:00
Diego Perez
56f4978b0d Merge "Fix layoutlib expand unit test" into nyc-dev am: e6423ee0ed 
am: 151df69f5f

* commit '151df69f5fe0fde05fd66eb054cada24187ca694':
  Fix layoutlib expand unit test
 2016-03-02 09:24:58 +00:00
Nimrod Gileadi
a2f24a01f1 Merge "Close InputStream in BatteryStatsHelper" into nyc-dev 
am: c14893bf5a

* commit 'c14893bf5a2ad76ad6279f09b66020610e32041f':
  Close InputStream in BatteryStatsHelper
 2016-03-02 09:24:38 +00:00
Nimrod Gileadi
c14893bf5a Merge "Close InputStream in BatteryStatsHelper" into nyc-dev 2016-03-02 09:17:21 +00:00
Tomasz Mikolajewski
d191d076b8 Merge "Fix DocumentUI\'s perf tests compile failure." into nyc-dev 
am: 0d26fdb6cd

* commit '0d26fdb6cd3c4637ec2c4db7467c739991285a0b':
  Fix DocumentUI's perf tests compile failure.
 2016-03-02 09:17:10 +00:00
Diego Perez
151df69f5f Merge "Fix layoutlib expand unit test" into nyc-dev 
am: e6423ee0ed

* commit 'e6423ee0eda00466172d86917d6d66112974f342':
  Fix layoutlib expand unit test
 2016-03-02 09:15:36 +00:00
Erik Kline
64cdb3d3a1 Add 464xlat notification callback am: 8d6edc3270 am: 24f7d5e655 
am: 57e047dcb0

* commit '57e047dcb0b26cea4f768dcf517ed27bbfb52900':
  Add 464xlat notification callback
 2016-03-02 09:06:26 +00:00
Tomasz Mikolajewski
0d26fdb6cd Merge "Fix DocumentUI's perf tests compile failure." into nyc-dev 2016-03-02 09:00:48 +00:00
Lorenzo Colitti
e22fc07fa9 Merge changes Id78aab9c,I51096b18 into nyc-dev am: 1856df512f 
am: 057f24547a

* commit '057f24547afe0e2122863cab96b8149a43d3cf2d':
  Speed up ConnectivityServiceTest.
  Make it easier to test code that uses WakeupMessage.
 2016-03-02 08:59:08 +00:00
Tomasz Mikolajewski
f4628336b2 Fix DocumentUI's perf tests compile failure. 
It compiled locally, but not on the APCT.

Bug: 27370274
Change-Id: I7f10f3bf5b370d8e92311febfdcae133148e1312
 2016-03-02 17:57:46 +09:00
Diego Perez
e6423ee0ed Merge "Fix layoutlib expand unit test" into nyc-dev 2016-03-02 08:57:26 +00:00
Tomasz Mikolajewski
4b8397c438 Merge "Add a missing include in DocumentsUI Android.mk." into nyc-dev am: ed82931cae 
am: 6b99f43c2c

* commit '6b99f43c2cd3b3f4d8d9b768ca1060a47e07d8e9':
  Add a missing include in DocumentsUI Android.mk.
 2016-03-02 08:56:59 +00:00
Erik Kline
57e047dcb0 Add 464xlat notification callback am: 8d6edc3270 
am: 24f7d5e655

* commit '24f7d5e65556dd661e52476586f684cc10f9fea2':
  Add 464xlat notification callback
 2016-03-02 08:46:54 +00:00
Lorenzo Colitti
057f24547a Merge changes Id78aab9c,I51096b18 into nyc-dev 
am: 1856df512f

* commit '1856df512fc3d69096505491512fa26fb8ffdc09':
  Speed up ConnectivityServiceTest.
  Make it easier to test code that uses WakeupMessage.
 2016-03-02 08:38:59 +00:00
Erik Kline
24f7d5e655 Add 464xlat notification callback 
am: 8d6edc3270

* commit '8d6edc3270616b119645fbdf8752c0ea37de0731':
  Add 464xlat notification callback
 2016-03-02 08:37:06 +00:00
Lorenzo Colitti
1856df512f Merge changes Id78aab9c,I51096b18 into nyc-dev 
* changes:
  Speed up ConnectivityServiceTest.
  Make it easier to test code that uses WakeupMessage.
 2016-03-02 08:32:51 +00:00
Tomasz Mikolajewski
f08502ef1a Merge "Fix broken tests due to uninitialized roots." into nyc-dev am: 621a71c342 
am: 5882b829e6

* commit '5882b829e67d74b47eb4643a785dc63f15d92167':
  Fix broken tests due to uninitialized roots.
 2016-03-02 08:28:58 +00:00
Sungsoo Lim
54d29bb301 Merge "MediaBrowserService: Make SubscriptionCallback.onError be called" into nyc-dev am: 4a67d975e4 
am: bc287ddd15

* commit 'bc287ddd15c3b650bd38f64fd6ed37ee2851c47d':
  MediaBrowserService: Make SubscriptionCallback.onError be called
 2016-03-02 08:27:01 +00:00
Tomasz Mikolajewski
d27dc7f34b Merge "Add scaffolds for performance tests of DocumentsUI" into nyc-dev am: 1a06789959 
am: 53622d2950

* commit '53622d2950681d0e3ed7dd0a7cb3397a678a7884':
  Add scaffolds for performance tests of DocumentsUI
 2016-03-02 08:25:05 +00:00
Wale Ogunwale
d41195d65f Merge "Enable add/remove window manager log points" into nyc-dev am: 5b30f0df3f 
am: c69dfcd695

* commit 'c69dfcd69508536ec81ba145786b6abd5e6f0016':
  Enable add/remove window manager log points
 2016-03-02 08:22:58 +00:00
Tomasz Mikolajewski
6b99f43c2c Merge "Add a missing include in DocumentsUI Android.mk." into nyc-dev 
am: ed82931cae

* commit 'ed82931cae2c867288d3caf0ec04417ee59f73c5':
  Add a missing include in DocumentsUI Android.mk.
 2016-03-02 08:20:49 +00:00
Hyunyoung Song
1cd641c472 Merge "Update wallpaper asset for N dev preview Bug: 27434845" into nyc-dev am: c17fefe264 
am: 4f7d953750

* commit '4f7d95375043cc5edfccf314b639dcc248e1bc15':
  Update wallpaper asset for N dev preview Bug: 27434845
 2016-03-02 08:20:31 +00:00
Tomasz Mikolajewski
ed82931cae Merge "Add a missing include in DocumentsUI Android.mk." into nyc-dev 2016-03-02 08:06:04 +00:00
Tomasz Mikolajewski
04049407a8 Add a missing include in DocumentsUI Android.mk. 
Without it, perf tests were not built on APCT.

Bug: 27370274
Change-Id: Ie154526d240bb9d1b4cce6fc089d502bf808c366
 2016-03-02 17:03:47 +09:00
Lorenzo Colitti
bfecba2938 Speed up ConnectivityServiceTest. 
1. Override WakeupMessage with an implementation that uses
   sendEmptyMessageDelayed. This allows us to replace a
   6-second sleep with a 150ms wait.
2. Change waitFor()'s polling interval from 100ms to 50ms.

With these changes ConnectivityServiceTest goes from ~9s to ~3s.

Change-Id: Id78aab9cded90a5b17f09d7f437904e179808dd2
 2016-03-02 17:01:50 +09:00
Erik Kline
8d6edc3270 Add 464xlat notification callback 
Bug: 26238390
Bug: 26991160
Change-Id: I556e779c642d19cd8d26637dd98055157d005f77
 2016-03-02 16:50:46 +09:00
Lorenzo Colitti
cdbf981889 Merge changes Ic366b532,I0179b45b into nyc-dev am: b7ffb76437 
am: 6ad667122c

* commit '6ad667122c35098ab62afd92b5ac26937397825b':
  Move PinningNetworkCallback out to a new NetworkPinner class.
  Use MessageUtils in ConnectivityManager.
 2016-03-02 07:04:56 +00:00
Bryce Lee
c71485b205 DO NOT MERGE ANYWHERE Add way to query for supported Bluetooth profiles. am: 7c2539e2a5 -s ours am: 21c47d1b22 -s ours am: aa8a5cd9bb -s ours 
am: e5a652854d  -s ours

* commit 'e5a652854d6f94009c5eb826178aa18a52497102':
  DO NOT MERGE ANYWHERE Add way to query for supported Bluetooth profiles.
 2016-03-02 07:02:48 +00:00
Jeff Sharkey
e6ee9112d5 Merge "When system server goes down, crash admins." into nyc-dev am: 5ca0b3462d 
am: 49b57831fa

* commit '49b57831fa7baa3d83a6c149bed1b4abfafa3d4b':
  When system server goes down, crash admins.
 2016-03-02 07:00:38 +00:00
Jeff Sharkey
d1be3e0bdf Merge "When system server goes down, crash apps more." into nyc-dev am: 60b7bcc614 
am: 33a64f5e56

* commit '33a64f5e5600d86ef6ce270ce57fffbf4f2ab35d':
  When system server goes down, crash apps more.
 2016-03-02 06:57:26 +00:00
Fyodor Kupolov
ace9577f68 Merge "Restored switchTo method" into nyc-dev am: 5dbe1f30ef 
am: 80d150f441

* commit '80d150f44199d96e69dfd206c732763e7d4136a6':
  Restored switchTo method
 2016-03-02 06:54:45 +00:00
Jeff Sharkey
7ae7f53177 Merge "Start unaware persistent apps after user unlocked." into nyc-dev am: ab37f0f832 
am: 94a62b131e

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

* commit '744ed057157babc91696de2a983126c1cae631fb':
  Revert "Adding getManagedUserBadgedDrawableForDensity() to PackageManager."
 2016-03-02 06:48:53 +00:00
Insun Kang
50a9af14c5 Merge "Annotate Media section of framework/base" into nyc-dev am: 542221d68a 
am: af79855f84

* commit 'af79855f8402cfc71914b18106cb1d8293663eee':
  Annotate Media section of framework/base
 2016-03-02 06:46:41 +00:00
Steve McKay
7ab86daa6c Merge "Fix roots filtering for move operations." into nyc-dev am: de5ec832b1 
am: c3cfd763a9

* commit 'c3cfd763a92fad5fe7496b8673f9c5077d534176':
  Fix roots filtering for move operations.
 2016-03-02 06:44:26 +00:00
Selim Cinek
fb7e6ad69a Fixed a bug where the notification texts wouldn\'t animate am: 049f6adfb8 
am: bf964bb1aa

* commit 'bf964bb1aa8bdea287721a376f8b46e3b0f5e422':
  Fixed a bug where the notification texts wouldn't animate
 2016-03-02 06:42:11 +00:00
Jeff Sharkey
63bf7d23ac Merge "Don\'t evict SharedPreferences when migrate no-op." into nyc-dev am: 19c7699309 
am: e37ee97871

* commit 'e37ee97871f8be16a9bea704c1d81f0631532066':
  Don't evict SharedPreferences when migrate no-op.
 2016-03-02 06:39:56 +00:00
Jeff Sharkey
be622d88bf Merge "Make preferred activities encryption aware." into nyc-dev am: 8b609f3a96 
am: a4681f0300

* commit 'a4681f0300b5fbb52c0bc8ae75fc0a3dacaed4e4':
  Make preferred activities encryption aware.
 2016-03-02 06:37:29 +00:00
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
Tomasz Mikolajewski
5882b829e6 Merge "Fix broken tests due to uninitialized roots." into nyc-dev 
am: 621a71c342

* commit '621a71c342ab9c101b51a3b04db62792cfdbdcad':
  Fix broken tests due to uninitialized roots.
 2016-03-02 06:20:36 +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