LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,272 Commits 2 Branches 0 Tags
bd48d1e676d23f8f6ff9b57d1a92e4b3935bfecc
Commit Graph

13272 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
fc54e384c1 am a179e05f: am 1bd3e863: Fix build-tools version. do not merge. 
* commit 'a179e05f4dc79e937c463ed6e5e746734edf0a9f':
  Fix build-tools version. do not merge.
 2013-09-03 12:10:27 -07:00
Xavier Ducrohet
a179e05f4d am 1bd3e863: Fix build-tools version. do not merge. 
* commit '1bd3e86304e6501b430df893b0155490f6579348':
  Fix build-tools version. do not merge.
 2013-09-03 12:09:29 -07:00
Xavier Ducrohet
1bd3e86304 Fix build-tools version. do not merge. 
Change-Id: I28bc6fe53b8cf92fde49845c7fc0ffeccf58b937
 2013-09-03 12:04:38 -07:00
Xavier Ducrohet
057d8177e0 am 61c7ea8e: am a9068afa: (-s ours) am fd8979ff: am f01dda32: Update platform revision. DO NOT MERGE. 
* commit '61c7ea8e1e0496910aee457b2ca08028899c302d':
  Update platform revision. DO NOT MERGE.
 2013-08-30 17:29:14 -07:00
Xavier Ducrohet
61c7ea8e1e am a9068afa: (-s ours) am fd8979ff: am f01dda32: Update platform revision. DO NOT MERGE. 
* commit 'a9068afa3cb338d9949a3a78d6062e58b2dbdb71':
  Update platform revision. DO NOT MERGE.
 2013-08-30 17:26:20 -07:00
Xavier Ducrohet
a9068afa3c am fd8979ff: am f01dda32: Update platform revision. DO NOT MERGE. 
* commit 'fd8979ff310f051df51931ab90c1540f15ab8714':
  Update platform revision. DO NOT MERGE.
 2013-08-30 10:21:52 -07:00
Xavier Ducrohet
fd8979ff31 am f01dda32: Update platform revision. DO NOT MERGE. 
* commit 'f01dda325b859f8c481dd434ce748c1c1558f8c0':
  Update platform revision. DO NOT MERGE.
 2013-08-30 10:18:26 -07:00
Xavier Ducrohet
f01dda325b Update platform revision. DO NOT MERGE. 
Change-Id: Id49c7f47e81b000255de8eb8a02d1c74146bfdad
 2013-08-30 10:13:32 -07:00
Andrew Hsieh
35a69bf738 am bd58d761: am 19c6555d: Merge "Update NDK\'s android headers" 
* commit 'bd58d761074cf88df09f10d7a07e0ed8dd470ae0':
  Update NDK's android headers
 2013-08-29 18:27:41 -07:00
Andrew Hsieh
bd58d76107 am 19c6555d: Merge "Update NDK\'s android headers" 
* commit '19c6555d9deed3fb77ac2a76b2861e49542533c9':
  Update NDK's android headers
 2013-08-29 18:24:50 -07:00
Andrew Hsieh
19c6555d9d Merge "Update NDK's android headers" 2013-08-30 01:23:01 +00:00
Michael Wright
f3c3a93bc4 Update NDK's android headers 
Change-Id: I2ae3b42dcbbdccbcae018f768dc7b56723416d21
 2013-08-29 18:17:46 -07:00
Tom O'Neill
3e01427b42 Adapt to API constant changes 
- Affects b/10461474

Change-Id: I08bf5e1bd389428233638b1a19ec06a10393380f
 2013-08-29 15:40:10 -07:00
Igor Murashkin
8ac27eff4e eclipse classpath: add external/hamcrest (used by mockito) 
This fixes the "The hierarchy of the type is inconsistent" error
when using ArgumentMatcher from Mockito.

Change-Id: Ic5e74c7f7020a610fdb1c061a7eb3ecb4c487438
 2013-08-29 10:51:35 -07:00
The Android Automerger
5c3e54e1eb merge in klp-release history after reset to klp-dev 2013-08-28 06:00:19 -07:00
Tom O'Neill
1073385f86 am ed92f012: Merge "Test case where SettingsInjectorService.getStatus() errors out" into klp-dev 
* commit 'ed92f0123a23efa10c802a9023f51f46a2dcf2c1':
  Test case where SettingsInjectorService.getStatus() errors out
 2013-08-27 07:42:53 -07:00
Tom O'Neill
ed92f0123a Merge "Test case where SettingsInjectorService.getStatus() errors out" into klp-dev 2013-08-27 14:40:23 +00:00
The Android Automerger
843cefc2c0 merge in klp-release history after reset to klp-dev 2013-08-27 06:01:05 -07:00
Chong Zhang
424603a99e am 3e3d973c: am 21e0c25e: am 184f79db: Support7Demo: fix video playback on GB 
* commit '3e3d973c48a5d13ac616b92e70c186c2c6eab128':
  Support7Demo: fix video playback on GB
 2013-08-26 15:04:07 -07:00
Tom O'Neill
6154b800a9 am 7db79b35: Inject more settings for better testing of SettingsInjector 
* commit '7db79b35483922a07a3a144dd3354b1f0d0cc9b3':
  Inject more settings for better testing of SettingsInjector
 2013-08-26 15:03:55 -07:00
Tom O'Neill
f534ba3a12 Test case where SettingsInjectorService.getStatus() errors out 
- Also adapt to SettingsInjectorService intent rename

- Part of fix to b/10461474

Change-Id: If35325868ddd730924c4bb1c4543f31017e039f9
 2013-08-26 10:06:56 -07:00
Chong Zhang
3e3d973c48 am 21e0c25e: am 184f79db: Support7Demo: fix video playback on GB 
* commit '21e0c25efb54e5081434c1db07f55ed87ad4cd50':
  Support7Demo: fix video playback on GB
 2013-08-26 09:29:57 -07:00
Chong Zhang
21e0c25efb am 184f79db: Support7Demo: fix video playback on GB 
* commit '184f79db44846b492e2b8b3785b5b62df1f22479':
  Support7Demo: fix video playback on GB
 2013-08-26 09:28:22 -07:00
Chong Zhang
184f79db44 Support7Demo: fix video playback on GB 
Change-Id: I2d403832d82428746dd3ccdbe0cfd56315d72ed9
(cherry picked from commit dbcc746cb0d727ac9aed60bb4156b3bf9f4668aa)
 2013-08-26 16:25:45 +00:00
The Android Automerger
2bc68fdb60 merge in klp-release history after reset to klp-dev 2013-08-26 06:00:49 -07:00
Tom O'Neill
7db79b3548 Inject more settings for better testing of SettingsInjector 
- Test fix for b/10447517

Change-Id: Ifc579026a34d559093bb06f820d439a0876208b3
 2013-08-23 09:55:34 -07:00
Jeff Brown
008bfa7443 am cfa9cd0d: am 582f50f2: (-s ours) am 9299c6cd: Ensure sample runs on Gingerbread. (DO NOT MERGE) 
* commit 'cfa9cd0d85bb46cf2a47be8b0e137b3c3102bd02':
  Ensure sample runs on Gingerbread.  (DO NOT MERGE)
 2013-08-22 20:36:20 -07:00
Jeff Brown
cfa9cd0d85 am 582f50f2: (-s ours) am 9299c6cd: Ensure sample runs on Gingerbread. (DO NOT MERGE) 
* commit '582f50f2f6d4c1cf9a7ea5da9326aea157b0db3d':
  Ensure sample runs on Gingerbread.  (DO NOT MERGE)
 2013-08-22 20:34:41 -07:00
Jeff Brown
582f50f2f6 am 9299c6cd: Ensure sample runs on Gingerbread. (DO NOT MERGE) 
* commit '9299c6cdd8e5d084ef4c10e5b7f044e0ea590641':
  Ensure sample runs on Gingerbread.  (DO NOT MERGE)
 2013-08-22 20:28:01 -07:00
Jeff Brown
9299c6cdd8 Ensure sample runs on Gingerbread. (DO NOT MERGE) 
Unfortunately, the video does not play due to a MediaPlayer
exception but at least this version does not crash.

Change-Id: I0baf9239a8a12f92b4805bab226f21f46fa63693
(cherry picked from commit 854e16afda)
 2013-08-23 03:23:46 +00:00
Jeff Brown
22a994d112 am 854e16af: Ensure sample runs on Gingerbread. 
* commit '854e16afda1bbacbd5eee7e434059d493879497d':
  Ensure sample runs on Gingerbread.
 2013-08-22 20:11:55 -07:00
Jeff Brown
854e16afda Ensure sample runs on Gingerbread. 
Unfortunately, the video does not play due to a MediaPlayer
exception but at least this version does not crash.

Change-Id: I0baf9239a8a12f92b4805bab226f21f46fa63693
 2013-08-22 18:25:58 -07:00
Brett Chabot
859cff17af am c518764b: Merge "Fix runtest cts-net" into klp-dev 
* commit 'c518764b02d4b99b06400dd1903019b1f44a78bf':
  Fix runtest cts-net
 2013-08-22 11:06:36 -07:00
Brett Chabot
c518764b02 Merge "Fix runtest cts-net" into klp-dev 2013-08-22 18:00:37 +00:00
Brett Chabot
315d72f730 Fix runtest cts-net 
Change-Id: Ia3f7e058c48a8c84e465602e1af172ba75ff1154
 2013-08-22 10:26:52 -07:00
The Android Automerger
ccc84a24aa merge in klp-release history after reset to klp-dev 2013-08-22 06:00:42 -07:00
Brett Chabot
ab53bde891 am dfc82ebe: Merge "Find install artifacts using GET-INSTALL-PATH." into klp-dev 
* commit 'dfc82ebe7db366e6e3b717fc1d9d60edd6e1c8c8':
  Find install artifacts using GET-INSTALL-PATH.
 2013-08-21 20:11:26 -07:00
Brett Chabot
dfc82ebe7d Merge "Find install artifacts using GET-INSTALL-PATH." into klp-dev 2013-08-22 01:13:28 +00:00
Mathew Inwood
6901ab3867 am af73d576: Remove ApplicationsProvider. 
* commit 'af73d576e9744a8d32c64b66bf8bdd6c3e0f1881':
  Remove ApplicationsProvider.
 2013-08-21 09:36:08 -07:00
Mathew Inwood
af73d576e9 Remove ApplicationsProvider. 
ApplicationsProvider is going away since it's no longer needed. Remove it
from test config first.

Bug: 10407790
Change-Id: Ia2e6823e88bc66096e9dc6df0fcc2aef396454fc
 2013-08-21 17:05:40 +01:00
The Android Automerger
5ee27e5287 merge in klp-release history after reset to klp-dev 2013-08-21 06:01:39 -07:00
Brett Chabot
5f5928cc42 Find install artifacts using GET-INSTALL-PATH. 
Change-Id: I7eb3229885df814ab25eb445f40963859b163bf1
 2013-08-20 17:07:52 -07:00
Tom O'Neill
aad48db964 am cf06a033: Merge "Settings injector sample activity" into klp-dev 
* commit 'cf06a033d01c4f518c7bdc4c7cc063a24baa4249':
  Settings injector sample activity
 2013-08-20 07:18:33 -07:00
Tom O'Neill
cf06a033d0 Merge "Settings injector sample activity" into klp-dev 2013-08-20 14:16:04 +00:00
The Android Automerger
5f40b7f6b1 merge in klp-release history after reset to klp-dev 2013-08-20 06:00:56 -07:00
Jeff Brown
89e2ff4986 am bd278677: Merge "Fix NPE in sample code." into klp-dev 
* commit 'bd278677694ae13e1a6d532a9bab954f74bba4b0':
  Fix NPE in sample code.
 2013-08-19 13:38:21 -07:00
Jeff Brown
bd27867769 Merge "Fix NPE in sample code." into klp-dev 2013-08-19 20:36:42 +00:00
Tom O'Neill
3b8f424558 Settings injector sample activity 
- Tests implementation of b/10287745

Change-Id: I5bf3323be78a16b660eadb96eadc6bf29197ace5
 2013-08-19 13:13:34 -07:00
Vinit Deshapnde
0f268d0935 am 24fa6aa6: Merge "Expose WifiManager.setTdlsEnabled public API" into klp-dev 
* commit '24fa6aa6d9d04fc0cde8febb8eb46f731712542f':
  Expose WifiManager.setTdlsEnabled public API
 2013-08-19 12:19:15 -07:00
Vinit Deshapnde
24fa6aa6d9 Merge "Expose WifiManager.setTdlsEnabled public API" into klp-dev 2013-08-19 19:14:04 +00:00