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

237111 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
08e3e66675 Merge "Track libcore change 2729b8c4d26170." am: 238e591be6 am: 9c4b2f6875 
am: 863c298852

* commit '863c2988525690768799fdfcaf59f7372e8ac523':
  Track libcore change 2729b8c4d26170.
 2016-03-02 15:16:06 +00: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
cd9915884d Merge "Track libcore change 2729b8c4d26170." into nyc-dev am: 9d0aa47c65 
am: 09b59e113d

* commit '09b59e113d571e0d6bf0bc8eaf06620bfa86d96d':
  Track libcore change 2729b8c4d26170.
 2016-03-02 14:55:13 +00:00
Kenny Guy
8370a5a407 Merge "Don\'t clear widget providers from stopped profiles." into nyc-dev am: 153c30b747 
am: fdac3ed87d

* commit 'fdac3ed87d43dbd0aad6a44c474b3896e712dd9b':
  Don't clear widget providers from stopped profiles.
 2016-03-02 14:53:37 +00:00
Deepanshu Gupta
b5f879dca0 Merge "Add StubMethodAdapterTest" into nyc-dev am: 1aeb31bdbb 
am: 71281b53c8

* commit '71281b53c8a30d7e7cbdd406f8a95a11b8468cd1':
  Add StubMethodAdapterTest
 2016-03-02 14:52:00 +00:00
Geoff Mendal
85162a2bbb Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7a0b6e5213 -s ours 
am: 294c49e71e  -s ours

* commit '294c49e71e52dfac85e1656a013a21525d79d5e1':
  Import translations. DO NOT MERGE
 2016-03-02 14:50:18 +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
Geoff Mendal
cf13f0a7f6 Merge "Import translations. DO NOT MERGE" 2016-03-02 14:08:13 +00:00
Geoff Mendal
687aa42a51 Import translations. DO NOT MERGE 
Change-Id: I7abcf9b0931efc3fb6f3e6b6ac17b22aeeb83bb6
Auto-generated-cl: translation import
 2016-03-02 06:07:02 -08:00
Deepanshu Gupta
46a3931b9c LayoutLib: Reference android\'s junit in intellij project. am: dbe8a0fe3b 
am: e34ec294a0

* commit 'e34ec294a00fd33abddc3dfa88443492c2f6c075':
  LayoutLib: Reference android's junit in intellij project.
 2016-03-02 14:06:51 +00:00
Geoff Mendal
44ef0c4868 Merge "Import translations. DO NOT MERGE" 2016-03-02 14:03:59 +00:00
Geoff Mendal
5b1e4f1533 Import translations. DO NOT MERGE 
Change-Id: I3fd62cccd44999bb34631b181a8ede1ffe5b33e3
Auto-generated-cl: translation import
 2016-03-02 06:00:10 -08: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
Geoff Mendal
d7457d9990 Merge "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
Geoff Mendal
7c0cbddf3e Import translations. DO NOT MERGE 
Change-Id: Ib585d2cab02a1d9ddc66d633a85eb590c65fc607
Auto-generated-cl: translation import
 2016-03-02 05:45:07 -08: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
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