Lorenzo Colitti
2e522faf51
Merge "Add a test definition for framework networking tests." am: 4449cf857d am: f315f12dec am: ccacbc0960
...
am: 0ba778fd5a
Change-Id: Idd7aff124b6280ecbb89119506202a7d6729e266
2016-12-09 03:22:03 +00:00
Lorenzo Colitti
0ba778fd5a
Merge "Add a test definition for framework networking tests." am: 4449cf857d am: f315f12dec
...
am: ccacbc0960
Change-Id: I04d6ecb67dac4e4ed7c9ec77bb40a22e770ff1c8
2016-12-09 03:16:45 +00:00
Lorenzo Colitti
ccacbc0960
Merge "Add a test definition for framework networking tests." am: 4449cf857d
...
am: f315f12dec
Change-Id: I9888047eefa7b01287a904fac10b8a1e25cbae95
2016-12-09 03:11:13 +00:00
Lorenzo Colitti
f315f12dec
Merge "Add a test definition for framework networking tests."
...
am: 4449cf857d
Change-Id: I46aa7f78ee01c5be4d6b2ac9ce8f78443521ba2c
2016-12-09 03:06:12 +00:00
Lorenzo Colitti
4449cf857d
Merge "Add a test definition for framework networking tests."
2016-12-09 02:58:25 +00:00
Aurimas Liutikas
4396721c54
Merge "Add androidTest to test folder names." am: 35b0cafbc2 am: 5f503e25b8 am: 3b4f393ca4
...
am: a94939b2f3
Change-Id: I2c4719bec490113cb3286e6790ae85ea37dd2274
2016-12-09 00:11:17 +00:00
Aurimas Liutikas
a94939b2f3
Merge "Add androidTest to test folder names." am: 35b0cafbc2 am: 5f503e25b8
...
am: 3b4f393ca4
Change-Id: I8fdd38f6738345a320c842bad905559514586eb2
2016-12-09 00:07:01 +00:00
Aurimas Liutikas
3b4f393ca4
Merge "Add androidTest to test folder names." am: 35b0cafbc2
...
am: 5f503e25b8
Change-Id: I4b79c4ff1ae7b26e8fdc654c0311d70d7b782514
2016-12-09 00:01:31 +00:00
Aurimas Liutikas
5f503e25b8
Merge "Add androidTest to test folder names."
...
am: 35b0cafbc2
Change-Id: I7f540db251e56713da39cae7ade3c13dd1e2a078
2016-12-08 23:56:31 +00:00
Aurimas Liutikas
35b0cafbc2
Merge "Add androidTest to test folder names."
2016-12-08 23:48:59 +00:00
Lorenzo Colitti
c1c0bfc6a5
Add a test definition for framework networking tests.
...
Test: runtest frameworks-net # Runs tests.
Bug: 31479480
(cherry picked from commit 5439831ee0 )
Change-Id: If1357b43548620c993e4306ee19f9537830be553
2016-12-08 18:48:19 +09:00
TreeHugger Robot
28c795c54b
Merge changes from topic 'monkey and bugreport tools'
...
* changes:
Add a command to run monkeys locally over and over again and collect the results.
Add --logcat which will use an external logcat file instead of the one in the bugreport.
Add an bugreport command which can format the output of an anr from a monkey run into a nice html file.
Send monkey logs to logcat as well.
Add --match-description to Monkey
2016-12-08 03:14:23 +00:00
Yigit Boyar
e6aa64fdad
Add androidTest to test folder names.
...
This conforms the docs here:
http://tools.android.com/tech-docs/new-build-system/user-guide
Change-Id: I6d91073924f578e813986f458b391c9b1dcf923c
2016-12-07 17:30:49 -08:00
Joe Onorato
186e55cfcc
Add a command to run monkeys locally over and over again and collect the results.
...
Change-Id: I1623552582a07ddcd3de79332bbb0b00f0a793e2
2016-12-07 17:07:08 -08:00
Joe Onorato
c898541ae2
Add --logcat which will use an external logcat file instead of the one in the bugreport.
...
Change-Id: Ifcdafd56edbc0b15207777427f501eb9e00b3a0d
2016-12-07 17:07:00 -08:00
Joe Onorato
978c5dd2c8
Add an bugreport command which can format the output of an anr from a monkey run into a nice html file.
...
Change-Id: I01a922860a5a90cda27d338ae0f99cd36176af99
2016-12-07 17:06:47 -08:00
Joe Onorato
9b433529b9
Send monkey logs to logcat as well.
...
Change-Id: I14ec175afb963a4d3c3b790c25e4bebb3b25a4dc
2016-12-07 17:05:59 -08:00
Joe Onorato
a56875b997
Add --match-description to Monkey
...
Which lets it ignore monkey errors that don't match the pattern you supply
Change-Id: I69e8b02e7172223e7313d0fbd87af395d2d4f0a2
2016-12-07 17:03:14 -08:00
Aurimas Liutikas
c5dbc099d6
Merge "Support for ignore checkstyle files" am: 453a71d710 am: 92ae646407 am: 57f03de316
...
am: 404deced68
Change-Id: I5aa4a2a6b08255d27b07ddd062c986a748469066
2016-12-08 00:09:08 +00:00
Aurimas Liutikas
404deced68
Merge "Support for ignore checkstyle files" am: 453a71d710 am: 92ae646407
...
am: 57f03de316
Change-Id: I4df66c63351be3dc73c04e9dab5eb4cfe4b47288
2016-12-08 00:05:07 +00:00
Aurimas Liutikas
57f03de316
Merge "Support for ignore checkstyle files" am: 453a71d710
...
am: 92ae646407
Change-Id: I708e6656020a6cdab789266c9117139afcd89391
2016-12-08 00:01:06 +00:00
Aurimas Liutikas
92ae646407
Merge "Support for ignore checkstyle files"
...
am: 453a71d710
Change-Id: Icffc0f71782eb3f5edb29bfc25130601dc2853e5
2016-12-07 23:57:06 +00:00
Aurimas Liutikas
453a71d710
Merge "Support for ignore checkstyle files"
2016-12-07 23:49:34 +00:00
Yigit Boyar
99f3d7af24
Support for ignore checkstyle files
...
This CL extends checkstyle check to search for IGNORE_CHECKSTYLE
files in folders which marks them as excluded from checkstyle,
including their sub folders
Change-Id: Id2390bb2a92e03f49c0014888e21549279e4bab6
2016-12-07 10:27:35 -08:00
Dmitry Dementyev
6854880b61
Merge "Temporary remove account visibility support pushapiauthenticator."
2016-12-06 00:34:05 +00:00
Dmitry Dementyev
d9fc9adf22
Temporary remove account visibility support pushapiauthenticator.
...
Refactor push api test apps to have more similar code and use another
manifest entry.
Bug: https://b.corp.google.com/issues/33046496
Test: none
Change-Id: I2c87ccae0e73892eb15fb3e6f98bbb7372e0a24a
2016-12-05 14:35:04 -08:00
Alan Viverette
8ec85d6c93
Merge "Allow passing custom checks to checkstyle" am: 32abb71122 am: d5f8802f6c am: c644754416
...
am: 79ceda2307
Change-Id: Id6390f3c537434061d80866e736cffdb34d72b85
2016-12-05 19:47:48 +00:00
Alan Viverette
79ceda2307
Merge "Allow passing custom checks to checkstyle" am: 32abb71122 am: d5f8802f6c
...
am: c644754416
Change-Id: I175b8fe0f7dedfc3009bb27a59cb7c1ee63574e4
2016-12-05 19:44:09 +00:00
Alan Viverette
c644754416
Merge "Allow passing custom checks to checkstyle" am: 32abb71122
...
am: d5f8802f6c
Change-Id: I4808fba588df2790379c5aab88e75675bae55db9
2016-12-05 19:41:04 +00:00
Alan Viverette
d5f8802f6c
Merge "Allow passing custom checks to checkstyle"
...
am: 32abb71122
Change-Id: If6634fcab836edcf5f30fe5e9f0ac8f929f326ad
2016-12-05 19:38:03 +00:00
Treehugger Robot
32abb71122
Merge "Allow passing custom checks to checkstyle"
2016-12-05 19:33:18 +00:00
Alan Viverette
50fb0a915b
Allow passing custom checks to checkstyle
...
Bug: 32998581
Change-Id: Icf349a8ff47ebc434958b872f5729b126e67bcbb
2016-12-05 12:44:23 -05:00
Yohann Roussel
9bcc30a78a
Merge "Deliver android-support-multidex.jack in SDK" am: da07dcd7f9 am: d29421db99 am: 32e1696537
...
am: 4fe4e0dafe
Change-Id: I672e73971578877a8c37c1887ea1201e6e12937c
2016-12-05 15:50:22 +00:00
Yohann Roussel
4fe4e0dafe
Merge "Deliver android-support-multidex.jack in SDK" am: da07dcd7f9 am: d29421db99
...
am: 32e1696537
Change-Id: Idc9f564f50dbad88f5610d80b57e3e5bc225d604
2016-12-05 15:47:21 +00:00
Yohann Roussel
32e1696537
Merge "Deliver android-support-multidex.jack in SDK" am: da07dcd7f9
...
am: d29421db99
Change-Id: I324b5572e68b64378ae70076258f677a64a1d0ab
2016-12-05 15:43:21 +00:00
Yohann Roussel
d29421db99
Merge "Deliver android-support-multidex.jack in SDK"
...
am: da07dcd7f9
Change-Id: I7e9e51ade83f3cc2b7d141a45ec1a43fac804b4e
2016-12-05 15:36:50 +00:00
Yohann Roussel
da07dcd7f9
Merge "Deliver android-support-multidex.jack in SDK"
2016-12-05 15:32:59 +00:00
Makoto Onuki
d4c3e6f7a4
Merge "Don't assume getActivity() is @NonNull"
2016-12-02 16:35:04 +00:00
Makoto Onuki
ea9c4b3b05
Don't assume getActivity() is @NonNull
...
Test: Manual testing.
Change-Id: I871a8b4341cfa32c142c2f7a84fc1b2b5ca32271
2016-12-01 08:44:23 -08:00
Aurimas Liutikas
51ff85e3e6
Merge "Removing pre-push.py git hook for checkstyle." am: fff72bd810 am: 3475b7f16d am: c114d50846
...
am: 7eee848ae3
Change-Id: I3ee2f0f9fd6ff79be35bd82290fde9e6984f95a9
2016-11-30 22:25:31 +00:00
Aurimas Liutikas
7eee848ae3
Merge "Removing pre-push.py git hook for checkstyle." am: fff72bd810 am: 3475b7f16d
...
am: c114d50846
Change-Id: Idc9e0401cb5aa84cf8c303d1ec2f81d3957af5b6
2016-11-30 22:20:29 +00:00
Aurimas Liutikas
c114d50846
Merge "Removing pre-push.py git hook for checkstyle." am: fff72bd810
...
am: 3475b7f16d
Change-Id: I9428a2169d6577df820189d3233d9db90e491bf7
2016-11-30 22:15:59 +00:00
Aurimas Liutikas
3475b7f16d
Merge "Removing pre-push.py git hook for checkstyle."
...
am: fff72bd810
Change-Id: I76b9cfe873b62836ffa059ded35045831fad3d7f
2016-11-30 22:12:31 +00:00
Aurimas Liutikas
fff72bd810
Merge "Removing pre-push.py git hook for checkstyle."
2016-11-30 22:02:31 +00:00
Yin-Chia Yeh
c0a6724976
Merge "Camera: update NDK LSC header" am: 6d59728432 am: bc15a9e321 am: d7aeef17c7
...
am: 172c188a6d
Change-Id: Id4e27f5a6dfba9a0fb80c7b8922bb6c2bc8a03ea
2016-11-30 20:21:24 +00:00
Nasir Khan
fb9c333290
Merge "Update the Notepad sample app to: 1. Show that any application state should be saved in onStop() versus onPause(). 2. Remove the deprecated methods and start using CursorLoader instead of any managedQuery. 3. Remove deprecated LiveFolders usage. am: 3468e63e12 am: ed5495cdee am: 3c4b761ea9" into nyc-mr2-dev-plus-aosp
...
am: 1fe92b554a
Change-Id: I640071428b9f82d3dbb8d402c7069e763c271085
2016-11-30 20:16:36 +00:00
Nasir Khan
1d8e2c2c61
Update the Notepad sample app to: 1. Show that any application state should be saved in onStop() versus onPause(). 2. Remove the deprecated methods and start using CursorLoader instead of any managedQuery. 3. Remove deprecated LiveFolders usage. am: 3468e63e12 am: ed5495cdee am: 3c4b761ea9
...
am: 5646fdbca5
Change-Id: Ifb56384cf798fc8ba0752adb19a48b86865983ec
2016-11-30 20:16:34 +00:00
Yin-Chia Yeh
172c188a6d
Merge "Camera: update NDK LSC header" am: 6d59728432 am: bc15a9e321
...
am: d7aeef17c7
Change-Id: I5eddc2d7dea33f67fc1543665476646f9850c661
2016-11-30 20:16:23 +00:00
Nasir Khan
3a746f6b2f
Update the Notepad sample app to: 1. Show that any application state should be saved in onStop() versus onPause(). 2. Remove the deprecated methods and start using CursorLoader instead of any managedQuery. 3. Remove deprecated LiveFolders usage. am: 3468e63e12 am: ed5495cdee am: 8dc5ea8f13
...
am: 2d693fd83b
Change-Id: I4fbbf382ff165eab2bbf9bef2c1678841eda01dc
2016-11-30 20:16:21 +00:00
Android Build Merger (Role)
1fe92b554a
Merge "Update the Notepad sample app to: 1. Show that any application state should be saved in onStop() versus onPause(). 2. Remove the deprecated methods and start using CursorLoader instead of any managedQuery. 3. Remove deprecated LiveFolders usage. am: 3468e63e12 am: ed5495cdee am: 3c4b761ea9" into nyc-mr2-dev-plus-aosp
2016-11-30 20:11:01 +00:00