LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,237 Commits 2 Branches 0 Tags
e948041d54ff7fcbda3605a2a7792d199ce6e4fd
Commit Graph

12237 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Shmidt
e948041d54 Merge "Connectivity: Add IP config to TDLS test" 2013-07-19 23:27:15 +00:00
Dirk Dougherty
b909ea3141 am b4cddf93: am c821270d: am 80f50242: am d06f4e32: am 6ac22572: Update appengine server to handle \'@\'. 
* commit 'b4cddf93e355b15db33dc6bf7d36ffbe3541cb1d':
  Update appengine server to handle '@'.
 2013-07-19 16:02:13 -07:00
Dmitry Shmidt
81253bc376 Connectivity: Add IP config to TDLS test 
Change-Id: I70096a042faaacdaeed7d6aae16a95704202ef1d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2013-07-19 15:55:35 -07:00
Dirk Dougherty
b4cddf93e3 am c821270d: am 80f50242: am d06f4e32: am 6ac22572: Update appengine server to handle \'@\'. 
* commit 'c821270d716ca73a998ece17c9d5bf593bdf590e':
  Update appengine server to handle '@'.
 2013-07-19 13:43:05 -07:00
Jeff Brown
e0540e6c50 Merge "Update paths to framework intermediates." 2013-07-19 19:35:14 +00:00
Dmitry Shmidt
4a5e169b68 Merge "Connectivity: Add TDLS test" 2013-07-19 00:07:04 +00:00
Dmitry Shmidt
47a5a18431 Connectivity: Add TDLS test 
Bug: 8539031

Change-Id: I68e9e2e93d49f29ed915a462570cb8e782e9a4f2
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2013-07-18 16:32:30 -07:00
Jeff Brown
b32b92da3d Update paths to framework intermediates. 
Change-Id: Ic9e54cd14234ee1b03d1fd98b479fc191af10830
 2013-07-18 16:30:39 -07:00
Santos Cordon
dccbd08f7a Merge "Adding InCallUI and Telephony service directories to classpath." 2013-07-18 17:41:11 +00:00
Dirk Dougherty
c821270d71 am 80f50242: am d06f4e32: am 6ac22572: Update appengine server to handle \'@\'. 
* commit '80f50242895afb4b43b231af5e78fcc8c5004206':
  Update appengine server to handle '@'.
 2013-07-17 10:24:47 -07:00
Dirk Dougherty
80f5024289 am d06f4e32: am 6ac22572: Update appengine server to handle \'@\'. 
* commit 'd06f4e3287483de270c9ea7a19acdff24efa1cb0':
  Update appengine server to handle '@'.
 2013-07-17 10:22:32 -07:00
Dirk Dougherty
d06f4e3287 am 6ac22572: Update appengine server to handle \'@\'. 
* commit '6ac22572e589d4cab6f2015aa63212d4c7c2a903':
  Update appengine server to handle '@'.
 2013-07-17 10:19:51 -07:00
Dirk Dougherty
6ac22572e5 Update appengine server to handle '@'. 
Change-Id: Ic06686f94d8cff822808e30034b102e859833454
 2013-07-17 10:08:27 -07:00
Andrew Hsieh
b1fc86ddc3 am 2bb3bd5a: am e96f2b6a: am 66623113: Merge "[MIPS] Add missing REAL macros." 
* commit '2bb3bd5a59a90b371c8b358adc1521501b5bffda':
  [MIPS] Add missing REAL macros.
 2013-07-15 09:42:06 -07:00
Andrew Hsieh
2bb3bd5a59 am e96f2b6a: am 66623113: Merge "[MIPS] Add missing REAL macros." 
* commit 'e96f2b6a5a93bbcd631070d5f1e82c8b7f845cee':
  [MIPS] Add missing REAL macros.
 2013-07-15 09:38:06 -07:00
Andrew Hsieh
e96f2b6a5a am 66623113: Merge "[MIPS] Add missing REAL macros." 
* commit '66623113fa2192374220e3df25fc040fa0ab6ade':
  [MIPS] Add missing REAL macros.
 2013-07-15 09:35:13 -07:00
Andrew Hsieh
66623113fa Merge "[MIPS] Add missing REAL macros." 2013-07-15 16:31:38 +00:00
Stephan Linzner
a840d66f2e Merge "Fixed startActivity() Bug in LaunchActivityTest" 2013-07-15 11:23:38 +00:00
Lai Wei-Chih
db279bedd6 [MIPS] Add missing REAL macros. 
Change-Id: If396e16a759d90f94213deb536f3d1c9dcb6c132
 2013-07-15 10:09:06 +08:00
Santos Cordon
a4bfa424ee Adding InCallUI and Telephony service directories to classpath. 
also fix duplicate libdvm entry which caused an error in eclipse.

Change-Id: I7e843f0f28e1d64af5536dee39cb994b9a188035
 2013-07-12 15:05:03 -07:00
Raphael Moll
28b60d8211 Merge "SDK: Windows USB driver rev 8." 2013-07-12 21:38:50 +00:00
Raphael Moll
4ea71d80a5 Merge "Use prop_templates for build_tools, plat_tools & support source.properties." 2013-07-12 21:38:21 +00:00
Stephan Linzner
8397e0c6f7 Fixed startActivity() Bug in LaunchActivityTest 
Activity under test was called in setUp instead of each test method.
Now each test method makes a separate call to startActivity() like
mentioned in our documentation.

Change-Id: I41df74cd5dae30e57cb481bb85714e361a9189e8
Signed-off-by: Stephan Linzner <slinzner@google.com>
 2013-07-12 13:21:47 +02:00
Stephan Linzner
682ed1d880 Merge "Initial Commit for Android Testing Training Sample" 2013-07-12 11:15:31 +00:00
JP Abgrall
f38107c03f testrunner: don't hardcode "out" 
"out" can actually be $OUT_DIR.
"out/host/arch" is actually $ANDROID_HOST_OUT.

Bug: 7183057
Change-Id: I91ed7fdd57da92288f0529ba60cef1520b6d31d3
 2013-07-11 17:39:16 -07:00
The Android Open Source Project
918d5a1a84 am 116ae7da: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge 
* commit '116ae7da7607208a679e91399d3b3adb9b10a637':
 2013-07-11 11:49:45 -07:00
Jesse Hall
8411cd65e4 am 2bfb93da: am 4b571253: Merge "Load ES3 functions with eglGetProcAddress, not dlsym" into jb-mr2-dev 
* commit '2bfb93da26494cf253bab2ed9c860f881b480487':
  Load ES3 functions with eglGetProcAddress, not dlsym
 2013-07-11 10:17:34 -07:00
The Android Open Source Project
32dab3e0d6 am 8289f1f4: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge 
* commit '8289f1f450efb2c3201dd0f39b4163f8a1543df4':
 2013-07-11 10:17:24 -07:00
Jeff Brown
e3aade7f01 am 77707d62: am 8b51a39f: Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev 
* commit '77707d620d04bcfbbdda5d6b6692175e0c0dd25e':
  Revert "Remove mediarouter v7 support library from SDK."
 2013-07-11 10:17:01 -07:00
The Android Open Source Project
116ae7da76 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: I14f58bf34aaf5bc683334aa8fc0859fa8044c69d
 2013-07-11 08:23:49 -07:00
The Android Open Source Project
c6bb3c6d9f am 044f4606: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge 
* commit '044f46062a220f33eaeb1a1045f1c50a8bc9a10f':
 2013-07-11 08:08:08 -07:00
Stephan Linzner
fcf428647f Initial Commit for Android Testing Training Sample 
Testing training sample code for Activity testing. Including
test cases for Instrumentation and Unit Testing of Activities
Uses old test structure with src/ and tests/ folder for
easy import to eclipse. Contains a build.gradle to
easily run it via the new build system from cli. Remapping
of tests/ is done within the build.gradle configuration file

Change-Id: I15f815ad185257a8fa650b3c0f10ba761044379c
Signed-off-by: Stephan Linzner <slinzner@google.com>
 2013-07-11 16:05:31 +02:00
The Android Automerger
38d9178d35 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-11 05:55:14 -07:00
Raphael Moll
4bc66d0f85 SDK: Windows USB driver rev 8. 
Fixes for Nexus 7 and generic PIDs.

SDK Bugs: b/6494263, b/9322844

Change-Id: I40ea1d1abdb557dd7c67873ac592cbc2320754d5
 2013-07-10 12:38:55 -07:00
Jesse Hall
2bfb93da26 am 4b571253: Merge "Load ES3 functions with eglGetProcAddress, not dlsym" into jb-mr2-dev 
* commit '4b571253095629540ecee414caa9e601ec304e6a':
  Load ES3 functions with eglGetProcAddress, not dlsym
 2013-07-10 09:36:09 -07:00
Jesse Hall
4b57125309 Merge "Load ES3 functions with eglGetProcAddress, not dlsym" into jb-mr2-dev 2013-07-10 16:32:48 +00:00
The Android Open Source Project
8289f1f450 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: I9629362dd810549cdaad8633361e761b81fc9d5c
 2013-07-10 08:34:34 -07:00
The Android Automerger
93e117c68d merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-10 05:55:10 -07:00
Jeff Brown
77707d620d am 8b51a39f: Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev 
* commit '8b51a39fda458039e68b650eb46f90b95f4bddca':
  Revert "Remove mediarouter v7 support library from SDK."
 2013-07-09 16:52:35 -07:00
Jeff Brown
8b51a39fda Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev 2013-07-09 23:44:58 +00:00
Jesse Hall
b7a2e33c11 Load ES3 functions with eglGetProcAddress, not dlsym 
Using dlopen/dlsym works, but eglGetProcAddress is a little easier and
more consistent with how GL extension functions (rather than these
non-extension functions) are loaded.

Change-Id: I082c193f08f7d5456389ab783a06cd38a9632d53
 2013-07-09 11:31:33 -07:00
The Android Open Source Project
044f46062a Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: Ief25c7aea75b2548938c669ca239d5178039a3f2
 2013-07-09 09:37:00 -07:00
The Android Automerger
edeeb6356c merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-09 05:55:17 -07:00
Jeff Brown
a18be3116a Revert "Remove mediarouter v7 support library from SDK." 
This reverts commit 408c184614.

Bug: 9425325
Change-Id: I340364c43f3040b454894e55a94be236ff999ce6
 2013-07-09 00:35:10 +00:00
Andrew Hsieh
b5d514b7bb am 1175ccb0: am c7ef0a3c: am 56de69b3: Merge "ndk: <sys/cdefs.h>: make wchar_t 32-bit for all API levels." 
* commit '1175ccb028bc2f59475b4af4a199313eb94121f9':
  ndk: <sys/cdefs.h>: make wchar_t 32-bit for all API levels.
 2013-07-08 16:03:08 -07:00
Andrew Hsieh
1175ccb028 am c7ef0a3c: am 56de69b3: Merge "ndk: <sys/cdefs.h>: make wchar_t 32-bit for all API levels." 
* commit 'c7ef0a3c0379a2ca81b6f82a9746c3c5405b8598':
  ndk: <sys/cdefs.h>: make wchar_t 32-bit for all API levels.
 2013-07-08 16:01:54 -07:00
Andrew Hsieh
c7ef0a3c03 am 56de69b3: Merge "ndk: <sys/cdefs.h>: make wchar_t 32-bit for all API levels." 
* commit '56de69b35beee71b7575fe86c0885f12523f481e':
  ndk: <sys/cdefs.h>: make wchar_t 32-bit for all API levels.
 2013-07-08 16:00:16 -07:00
Andrew Hsieh
56de69b35b Merge "ndk: <sys/cdefs.h>: make wchar_t 32-bit for all API levels." 2013-07-08 22:59:16 +00:00
Fred Chung
fde787842f am b597143c: am 7167a054: Bluetooth LE sample. 
* commit 'b597143cce0eefc7c749f82e233667a6975c4c75':
  Bluetooth LE sample.
 2013-07-08 15:24:08 -07:00
Fred Chung
b597143cce am 7167a054: Bluetooth LE sample. 
* commit '7167a054a8027f75025c865322fa84791a9b3bd1':
  Bluetooth LE sample.
 2013-07-08 15:22:09 -07:00