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

235672 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
ba58cfd125 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: cc3cae5edf  -s ours

* commit 'cc3cae5edfd41336697c33c82b52a289896d35f7':
  Import translations. DO NOT MERGE
 2016-03-02 15:32:10 +00:00
Geoff Mendal
bfe3c5ea65 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 840d8f1446  -s ours

* commit '840d8f1446c4d1519cb3c1138ea45b7936e6cfc7':
  Import translations. DO NOT MERGE
 2016-03-02 15:30:32 +00:00
Geoff Mendal
74bf44fa54 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: a865d5f4bb  -s ours

* commit 'a865d5f4bb5730dd3af0ea50367916e30217b2b7':
  Import translations. DO NOT MERGE
 2016-03-02 15:28:31 +00:00
Geoff Mendal
cc3cae5edf Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-02 15:26:07 +00:00
Geoff Mendal
6c9af03fce Import translations. DO NOT MERGE 
Change-Id: I5f64277ff355790a3babb97dfeb37ecc892dfa71
Auto-generated-cl: translation import
 2016-03-02 07:25:28 -08:00
Geoff Mendal
840d8f1446 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-02 15:22:28 +00:00
Geoff Mendal
1ddc11be55 Import translations. DO NOT MERGE 
Change-Id: Id4836eb0d7454cbb028a40032ecd229e4a4d90d3
Auto-generated-cl: translation import
 2016-03-02 07:20:37 -08:00
Geoff Mendal
a865d5f4bb Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-02 15:20:16 +00:00
Geoff Mendal
a302da37a7 Import translations. DO NOT MERGE 
Change-Id: If6f96f29b8c300b1edc27cf0725dfe3492465e7d
Auto-generated-cl: translation import
 2016-03-02 07:14:03 -08:00
Narayan Kamath
863c298852 Merge "Track libcore change 2729b8c4d26170." am: 238e591be6 
am: 9c4b2f6875

* commit '9c4b2f68758817405671b85c788c5da5063985f4':
  Track libcore change 2729b8c4d26170.
 2016-03-02 15:02:40 +00:00
Narayan Kamath
9c4b2f6875 Merge "Track libcore change 2729b8c4d26170." 
am: 238e591be6

* commit '238e591be6461f549a8020f4c3924d2a1abf868f':
  Track libcore change 2729b8c4d26170.
 2016-03-02 14:36:59 +00:00
Narayan Kamath
09b59e113d Merge "Track libcore change 2729b8c4d26170." into nyc-dev 
am: 9d0aa47c65

* commit '9d0aa47c656292eb97b583ea603d67bad1a376fe':
  Track libcore change 2729b8c4d26170.
 2016-03-02 14:29:45 +00:00
Kenny Guy
fdac3ed87d Merge "Don\'t clear widget providers from stopped profiles." into nyc-dev 
am: 153c30b747

* commit '153c30b747ef00c3e2bad75c7ab93a9405bcc051':
  Don't clear widget providers from stopped profiles.
 2016-03-02 14:27:43 +00:00
Narayan Kamath
9d0aa47c65 Merge "Track libcore change 2729b8c4d26170." into nyc-dev 2016-03-02 14:25:39 +00:00
Narayan Kamath
94825a16e0 Track libcore change 2729b8c4d26170. 
test-current.txt was regenerated on nyc-dev.

bug: 27423298

(cherry picked from commit b16a96538aa735c6926a95250fde2eca4b8e38ad)

Change-Id: Ieba7afaff407a421d3c2430f243151857cb42f97
 2016-03-02 14:18:30 +00:00
Kenny Guy
153c30b747 Merge "Don't clear widget providers from stopped profiles." into nyc-dev 2016-03-02 14:16:19 +00:00
Narayan Kamath
238e591be6 Merge "Track libcore change 2729b8c4d26170." 2016-03-02 14:14:50 +00:00
Deepanshu Gupta
71281b53c8 Merge "Add StubMethodAdapterTest" into nyc-dev 
am: 1aeb31bdbb

* commit '1aeb31bdbb86faef361567e37a71fe500a8f19ac':
  Add StubMethodAdapterTest
 2016-03-02 13:55:32 +00:00
Geoff Mendal
294c49e71e Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 7a0b6e5213  -s ours

* commit '7a0b6e5213b3b717392c9f505fd55180fccfabf9':
  Import translations. DO NOT MERGE
 2016-03-02 13:53:58 +00:00
Deepanshu Gupta
e34ec294a0 LayoutLib: Reference android\'s junit in intellij project. 
am: dbe8a0fe3b

* commit 'dbe8a0fe3b4f01f7457aafc30783e50b77c33ff3':
  LayoutLib: Reference android's junit in intellij project.
 2016-03-02 13:52:22 +00:00
Narayan Kamath
b16a96538a Track libcore change 2729b8c4d26170. 
bug: 27423298

Change-Id: I2d2eedd108896d5a027f06e159222a41bdcb3cb5
 2016-03-02 13:41:32 +00:00
Deepanshu Gupta
1aeb31bdbb Merge "Add StubMethodAdapterTest" into nyc-dev 2016-03-02 13:32:18 +00:00
Deepanshu Gupta
a9de835c17 Add StubMethodAdapterTest 
This tests the bugfix in StubMethodAdapter made in the change with id
I098996e43e330e995d33f12df1c16355bbc02f0f (commit 491523d)

Change-Id: I1ac897a49071dd9558bdc6b8abec29df913a6047
 2016-03-02 13:30:31 +00:00
Geoff Mendal
7a0b6e5213 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-02 13:28:44 +00:00
Deepanshu Gupta
dbe8a0fe3b LayoutLib: Reference android's junit in intellij project. 
Prevents errors due to mismatch in junit version.

Change-Id: I2adf32efb16472aa5f5e51025b6bb75afc76a8b4
 2016-03-02 13:26:18 +00:00
Geoff Mendal
492ebd85a9 Import translations. DO NOT MERGE 
Change-Id: I290495e9a0b12c372f30904725ac1d5fad961042
Auto-generated-cl: translation import
 2016-03-02 08:25:51 -05: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
Tomasz Mikolajewski
0d26fdb6cd Merge "Fix DocumentUI's perf tests compile failure." into nyc-dev 2016-03-02 09:00:48 +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
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
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
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
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
Tomasz Mikolajewski
621a71c342 Merge "Fix broken tests due to uninitialized roots." into nyc-dev 2016-03-02 06:12:29 +00:00
Sungsoo Lim
bc287ddd15 Merge "MediaBrowserService: Make SubscriptionCallback.onError be called" into nyc-dev 
am: 4a67d975e4

* commit '4a67d975e4e7d792e84ce4f2d2a5eba0da361533':
  MediaBrowserService: Make SubscriptionCallback.onError be called
 2016-03-02 05:46:21 +00:00
Tomasz Mikolajewski
53622d2950 Merge "Add scaffolds for performance tests of DocumentsUI" into nyc-dev 
am: 1a06789959

* commit '1a06789959fe66c21adc32319bd51601b414b112':
  Add scaffolds for performance tests of DocumentsUI
 2016-03-02 05:44:17 +00:00
Tomasz Mikolajewski
cf057efaff Fix broken tests due to uninitialized roots. 
Change-Id: I014657cab86ffa17290ab8990f0adaa6f6451e15
 2016-03-02 14:40:43 +09:00
Sungsoo Lim
4a67d975e4 Merge "MediaBrowserService: Make SubscriptionCallback.onError be called" into nyc-dev 2016-03-02 05:40:01 +00:00
Tomasz Mikolajewski
1a06789959 Merge "Add scaffolds for performance tests of DocumentsUI" into nyc-dev 2016-03-02 05:35:04 +00:00
Lorenzo Colitti
e7636e4750 Make it easier to test code that uses WakeupMessage. 
Code that uses WakeupMessage uses the AlarmManager. Testing such
code is slow because AlarmManager.MIN_FUTURITY ensures that
alarms must wait at least 5 seconds before firing.

This change makes WakeupMessage's fields protected so that test
code can subclass from it and override schedule() and cancel()
with implementations that do not use AlarmManager, for example
by making schedule() call sendEmptyMessageDelayed and making
cancel() call removeMessages.

Change-Id: I51096b182d9eb87cc7bd46c3c91906f18356b354
 2016-03-02 14:15:04 +09:00