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
Andrew Hsieh
293c746bdc am f05c9f97: am 85f9f764: Merge "Workaround for libportable wait4 implementation." 
* commit 'f05c9f97b39d4d17658577416dcc16d85c7582db':
  Workaround for libportable wait4 implementation.
 2013-07-22 12:17:45 -07:00
Andrew Hsieh
f05c9f97b3 am 85f9f764: Merge "Workaround for libportable wait4 implementation." 
* commit '85f9f764507761e011fc14398e7ddf08b5d383c5':
  Workaround for libportable wait4 implementation.
 2013-07-22 12:14:00 -07:00
Andrew Hsieh
85f9f76450 Merge "Workaround for libportable wait4 implementation." 2013-07-22 19:11:18 +00:00
Fred Chung
b6cd736ce9 am 8905657e: am 19dd9d20: Merge "Removed redundant launcher icon reference." into jb-mr2-dev 
* commit '8905657ea4b25ac6ee2820f79d6d9ed90aa2122e':
  Removed redundant launcher icon reference.
 2013-07-22 11:45:32 -07:00
Fred Chung
8905657ea4 am 19dd9d20: Merge "Removed redundant launcher icon reference." into jb-mr2-dev 
* commit '19dd9d200cc6783b468c4392a724dc1dd1f15523':
  Removed redundant launcher icon reference.
 2013-07-22 11:42:41 -07:00
Fred Chung
19dd9d200c Merge "Removed redundant launcher icon reference." into jb-mr2-dev 2013-07-22 18:37:53 +00:00
Fred Chung
581b9fdfb1 am 9aa3da19: am 63bc4aaf: Merge "App restriction for restricted profile sample." into jb-mr2-dev 
* commit '9aa3da19b5d0172e50d857ea3c640a64daf4b056':
  App restriction for restricted profile sample.
 2013-07-22 11:33:48 -07:00
Fred Chung
6758cf0530 Removed redundant launcher icon reference. 
Change-Id: I637736a97744db79e803e1fba4b5c0bd993e4e53
 2013-07-22 11:33:02 -07:00
Fred Chung
9aa3da19b5 am 63bc4aaf: Merge "App restriction for restricted profile sample." into jb-mr2-dev 
* commit '63bc4aaf4cef9e82fd6554f6a06f64815b809c6e':
  App restriction for restricted profile sample.
 2013-07-22 11:32:00 -07:00
Fred Chung
63bc4aaf4c Merge "App restriction for restricted profile sample." into jb-mr2-dev 2013-07-22 18:25:54 +00:00
Andrew Hsieh
3ae3903b32 am 615bd1f4: am 54009f7e: am 5d774594: Merge "ndk: Fix WCHAR_MIN / WCHAR_MAX definitions." 
* commit '615bd1f449158db3198fd27e6b53b0cf42ae6891':
  ndk: Fix WCHAR_MIN / WCHAR_MAX definitions.
 2013-07-22 09:34:46 -07:00
Andrew Hsieh
615bd1f449 am 54009f7e: am 5d774594: Merge "ndk: Fix WCHAR_MIN / WCHAR_MAX definitions." 
* commit '54009f7e95e2f9fffbcc771b4495a72045c5f381':
  ndk: Fix WCHAR_MIN / WCHAR_MAX definitions.
 2013-07-22 09:32:32 -07:00
Andrew Hsieh
54009f7e95 am 5d774594: Merge "ndk: Fix WCHAR_MIN / WCHAR_MAX definitions." 
* commit '5d7745946dfc76dc2c82ef4ff097dedd8913e393':
  ndk: Fix WCHAR_MIN / WCHAR_MAX definitions.
 2013-07-22 09:30:19 -07:00
Andrew Hsieh
5d7745946d Merge "ndk: Fix WCHAR_MIN / WCHAR_MAX definitions." 2013-07-22 16:28:08 +00:00
The Android Automerger
5296de3b22 merge in klp-release history after reset to master 2013-07-22 06:00:44 -07:00
Fred Chung
b71371d3af App restriction for restricted profile sample. 
This sample demonstrates how to expose restrictions for a restricted user on a multiuser device.  This feature is available on Android 4.3 (API level 18) and above platforms.

Change-Id: I4ef1bbda8e530dd8370d754de814fce96eaae1f1
 2013-07-21 23:19:18 -07:00
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
David 'Digit' Turner
fe8625d401 ndk: Fix WCHAR_MIN / WCHAR_MAX definitions. 
This fixes WCHAR_MIN / WCHAR_MAX to be signed / unsigned based on
the target ABI.

This only impacts ARM where wchar_t is really 'unsigned int'.
One can define _WCHAR_IS_ALWAYS_SIGNED to restore the old behaviour.

See http://b.android.com/55749

Change-Id: Idb63b7b11aecd3cfee37f5b6dd2eba78b308876f
 2013-07-20 00:56:53 +02: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
Siva Velusamy
28f992a9cd Release systrace into platform-tools 
Change-Id: Id05c92f96ecb38c5a056d51ba86ea2e91a45733d
 2013-07-19 15:05:24 -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
Igor Murashkin
eae9330f7b eclipse classpath: Add TestingCamera2 
Change-Id: Iee650dd2b76ab958c6ff536a0e72038305709344
 2013-07-18 17:33:10 -07: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
The Android Automerger
0bda4d75de merge in klp-release history after reset to master 2013-07-16 06:00:50 -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
The Android Automerger
6844b31b2c merge in klp-release history after reset to master 2013-07-15 06:01:00 -07: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