Commit Graph

17979 Commits

Author SHA1 Message Date
Elliott Hughes
8862cdc1b4 am e6845146: am 2acf10ae: Merge "Don\'t try to build libportable."
* commit 'e6845146001030ee2ac46f88aaaa280e5b181c09':
  Don't try to build libportable.
2015-06-24 20:20:30 +00:00
Elliott Hughes
e684514600 am 2acf10ae: Merge "Don\'t try to build libportable."
* commit '2acf10ae2171cbf74f34a4cf8f49f44e73031406':
  Don't try to build libportable.
2015-06-24 20:08:58 +00:00
Elliott Hughes
2acf10ae21 Merge "Don't try to build libportable." 2015-06-24 19:56:01 +00:00
Elliott Hughes
e9dcde67ad Don't try to build libportable.
Change-Id: I161a2e05c9bedddda40713346769878fb8c5a588
2015-06-24 12:41:52 -07:00
Guang Zhu
493829e7e7 am 84c84b3c: am 973ecb61: fix slotting of permission category
* commit '84c84b3c95f9f1928c7c44b3bb8e11df9a291828':
  fix slotting of permission category
2015-06-23 21:07:46 +00:00
Guang Zhu
84c84b3c95 am 973ecb61: fix slotting of permission category
* commit '973ecb61088ecac6b90d3332813544e0ebb69ab7':
  fix slotting of permission category
2015-06-23 20:51:50 +00:00
Guang Zhu
973ecb6108 fix slotting of permission category
Per convention, event categories that are not key events should
be inserted before the block of key event categories.

Change-Id: I2cbe4a34231462dbdee1f8b97270fdd0b3354690
2015-06-23 11:25:56 -07:00
Chris Craik
4697e4fbef am d7ad7710: am 400ae3d4: Merge "Support new systrace file structure after refactor"
* commit 'd7ad7710dd4f0299623650308f27f22dec6fedc2':
  Support new systrace file structure after refactor
2015-06-23 01:57:32 +00:00
Chris Craik
d7ad7710dd am 400ae3d4: Merge "Support new systrace file structure after refactor"
* commit '400ae3d4e7aebae8476bdc0dc688d454f6917a21':
  Support new systrace file structure after refactor
2015-06-23 01:44:41 +00:00
Chris Craik
400ae3d4e7 Merge "Support new systrace file structure after refactor" 2015-06-23 01:33:48 +00:00
Zhen Wang
05819dbf05 Support new systrace file structure after refactor
This is needed for
https://android-review.googlesource.com/#/c/154850/

Change-Id: Ibd5f33d0c038bfba37d81b23234945b9033c210a
Signed-off-by: Zhen Wang <zhenw@google.com>
2015-06-22 15:44:20 -07:00
Guang Zhu
dd0607708e am a6a4c70a: am 403be115: teach monkey to flip permissions on apps
* commit 'a6a4c70af2a28a3d9308e3881ddae96a91df71fe':
  teach monkey to flip permissions on apps
2015-06-21 20:34:29 +00:00
Guang Zhu
a6a4c70af2 am 403be115: teach monkey to flip permissions on apps
* commit '403be1157fb80c55e8b8c736485a4754a83288f2':
  teach monkey to flip permissions on apps
2015-06-21 20:22:22 +00:00
Guang Zhu
403be1157f teach monkey to flip permissions on apps
1. added a new MonkeyEvent type for permission events
2. added monkey permission utility for randomized permission
   events generation against targeted packages
3. refactored package whitelist/blacklist into MonkeyUtils class

Change-Id: I8f7998d74c3e28d02f5bcd47a0f9cc6167b93c93
2015-06-21 12:32:22 -07:00
Elliott Hughes
df6c88f742 am e60317ff: am 2807d953: Merge "Remove bogus "arch-p" directory."
* commit 'e60317ff510c1dcc8eadb12e32d3f5a83b43f178':
  Remove bogus "arch-p" directory.
2015-06-19 22:34:53 +00:00
Elliott Hughes
e60317ff51 am 2807d953: Merge "Remove bogus "arch-p" directory."
* commit '2807d9535a4db3a4ed40e17fd5b9a9be2b30929b':
  Remove bogus "arch-p" directory.
2015-06-19 22:22:51 +00:00
Elliott Hughes
2807d9535a Merge "Remove bogus "arch-p" directory." 2015-06-19 22:11:37 +00:00
Elliott Hughes
608e77f701 Remove bogus "arch-p" directory.
Change-Id: I89d9710357dc9ee490e2d54894b5fea48236a5b2
2015-06-19 14:19:11 -07:00
Santos Cordon
4f8f72340a am f4264c19: am 5050956d: Merge "Add telecom CTS shortcut." into mnc-dev
* commit 'f4264c193d7f4995e3b38ef4e2acafd6d97339ab':
  Add telecom CTS shortcut.
2015-06-19 13:56:35 +00:00
Santos Cordon
f4264c193d am 5050956d: Merge "Add telecom CTS shortcut." into mnc-dev
* commit '5050956d6fa9af7650160d452a46e69232e9c679':
  Add telecom CTS shortcut.
2015-06-18 22:44:36 +00:00
Santos Cordon
5050956d6f Merge "Add telecom CTS shortcut." into mnc-dev 2015-06-18 22:35:03 +00:00
Elliott Hughes
acaf6e3eb3 am 55eb5dba: am 7bc5bfc6: Merge "Retcon recent header fixes needed to build gdbserver."
* commit '55eb5dbad222299b315bd818c5e09cf0f55fd555':
  Retcon recent header fixes needed to build gdbserver.
2015-06-18 16:53:16 +00:00
Elliott Hughes
55eb5dbad2 am 7bc5bfc6: Merge "Retcon recent header fixes needed to build gdbserver."
* commit '7bc5bfc65c1f73f474b45b02d92d01032b79df3c':
  Retcon recent header fixes needed to build gdbserver.
2015-06-18 16:42:43 +00:00
Elliott Hughes
7bc5bfc65c Merge "Retcon recent header fixes needed to build gdbserver." 2015-06-18 16:29:53 +00:00
Elliott Hughes
e3ca8e7434 Retcon recent header fixes needed to build gdbserver.
Bug: http://b/21695943
Change-Id: I2b2f0e21a66093bdbbdbc0320ffa574eefaaf5fa
2015-06-17 21:51:13 -07:00
Miao Wang
850dbe3879 am d921b5cc: am 2306687c: Merge "[RenderScript] update sdk.atree to include libblas.so" into mnc-dev
* commit 'd921b5cc0afffe33b06b6c09b29bc9c8ff6bb976':
  [RenderScript] update sdk.atree to include libblas.so
2015-06-18 04:08:33 +00:00
Miao Wang
d921b5cc0a am 2306687c: Merge "[RenderScript] update sdk.atree to include libblas.so" into mnc-dev
* commit '2306687c881793c93e712bfa5c9b7a8623d61b2f':
  [RenderScript] update sdk.atree to include libblas.so
2015-06-18 03:56:14 +00:00
Miao Wang
2306687c88 Merge "[RenderScript] update sdk.atree to include libblas.so" into mnc-dev 2015-06-18 03:47:52 +00:00
Xavier Ducrohet
ba96c24718 am f0835992: am 749995dc: Update SDK Preview versions.
* commit 'f083599298e54f5ba25055e45ba52a675a053681':
  Update SDK Preview versions.
2015-06-18 01:28:57 +00:00
Miao Wang
4ca3aa6a60 [RenderScript] update sdk.atree to include libblas.so
bug: 21902810

Change-Id: Ia2ffb4ccfbba5201d4811919acfc37b6f13812b0
2015-06-17 18:08:22 -07:00
Xavier Ducrohet
f083599298 am 749995dc: Update SDK Preview versions.
* commit '749995dc8cafdb5d481040372013bfbb9bb5b1ca':
  Update SDK Preview versions.
2015-06-18 00:49:03 +00:00
Xavier Ducrohet
749995dc8c Update SDK Preview versions.
Change-Id: I2d20f7a8a4b201155045f16b42bd858b44181400
2015-06-17 17:24:16 -07:00
Siva Velusamy
ed47224820 am 2a1b42d4: am 18cdb045: Update platform tools to 23 rc3
* commit '2a1b42d473abffc728d37445a9422aad256f5de2':
  Update platform tools to 23 rc3
2015-06-16 21:26:20 +00:00
Siva Velusamy
2a1b42d473 am 18cdb045: Update platform tools to 23 rc3
* commit '18cdb045218222eeff26383e49f5e8d382c92b17':
  Update platform tools to 23 rc3
2015-06-16 21:13:46 +00:00
Siva Velusamy
18cdb04521 Update platform tools to 23 rc3
Change-Id: I37a4e3dfdb638e761d2f3337bf7f174ecdc42fc1
2015-06-16 13:01:21 -07:00
Chris Wren
797a34f8b7 am 9265a12e: am 5d969b3f: Merge "remove setLatestEventInfo from API samples" into mnc-dev
* commit '9265a12e443e6e1bbdb26c32ec71adc6ee609f9e':
  remove setLatestEventInfo from API samples
2015-06-15 21:22:22 +00:00
Chris Wren
9265a12e44 am 5d969b3f: Merge "remove setLatestEventInfo from API samples" into mnc-dev
* commit '5d969b3fa971d94150820176f2ac75a42ec865bf':
  remove setLatestEventInfo from API samples
2015-06-15 21:03:41 +00:00
Chris Wren
5d969b3fa9 Merge "remove setLatestEventInfo from API samples" into mnc-dev 2015-06-15 20:55:26 +00:00
Chris Wren
b6ba3c5f64 remove setLatestEventInfo from API samples
Bug: 18510449
Change-Id: I26a9dbc6c92b226e28798e5a348c9357c85405ab
2015-06-11 16:51:44 -04:00
Chris Craik
b9fc90ed7e am 5e96921b: am d32f6aef: Merge "Add tracing header" into mnc-dev
* commit '5e96921b4fbdc453a76de446cf296b725a775d36':
  Add tracing header
2015-06-11 17:14:20 +00:00
Chris Craik
5e96921b4f am d32f6aef: Merge "Add tracing header" into mnc-dev
* commit 'd32f6aefdea468354a6ed67e2722426a7170dae5':
  Add tracing header
2015-06-11 17:01:46 +00:00
Chris Craik
d32f6aefde Merge "Add tracing header" into mnc-dev 2015-06-11 16:49:56 +00:00
Chris Banes
c014758f80 am b1562f86: am 28701d10: Revert "Tinted icons sample"
* commit 'b1562f86b1d9cc81c1c489400932a6332163589b':
  Revert "Tinted icons sample"
2015-06-11 12:53:34 +00:00
Chris Banes
b1562f86b1 am 28701d10: Revert "Tinted icons sample"
* commit '28701d108d839ee157c0cae85bb8f3148d4ff3dc':
  Revert "Tinted icons sample"
2015-06-11 09:40:46 +00:00
Chris Banes
28701d108d Revert "Tinted icons sample"
This reverts commit 8e7ff4c3f2.

Change-Id: I011cc2afc4de0a572f42faaa4b19b90ba661140c
2015-06-11 08:32:41 +00:00
Vladislav Kaznacheev
b344bb1477 am 4a78c15f: am d18f135a: am d57a9edb: Adding AsyncListUtilActivity to Support7Demo
* commit '4a78c15f2fbf0b8ada6d8c3f53a4fc355de5fcc6':
  Adding AsyncListUtilActivity to Support7Demo
2015-06-11 02:54:18 +00:00
Vladislav Kaznacheev
4a78c15f2f am d18f135a: am d57a9edb: Adding AsyncListUtilActivity to Support7Demo
* commit 'd18f135ae2d1d60190dea4195583509d9ef22913':
  Adding AsyncListUtilActivity to Support7Demo
2015-06-11 02:10:17 +00:00
Vladislav Kaznacheev
d18f135ae2 am d57a9edb: Adding AsyncListUtilActivity to Support7Demo
* commit 'd57a9edb663615b84ac7467328619e5801053787':
  Adding AsyncListUtilActivity to Support7Demo
2015-06-11 01:34:11 +00:00
Jeff Brown
89c84e30bd am db47db1d: am bb08b33a: Merge "Expand Presentation demo to test 4K mode switches." into mnc-dev
* commit 'db47db1d0ded3f5fbf9b7653b7cfaa6b8804f085':
  Expand Presentation demo to test 4K mode switches.
2015-06-10 23:14:30 +00:00
Deepanshu Gupta
7a7efc91a7 am f897e623: am 7a4b2fb1: Merge "Update LayoutLib Api level to 15." into mnc-dev
* commit 'f897e623eea086c58247c71e7bc99315b66dda7a':
  Update LayoutLib Api level to 15.
2015-06-10 23:13:22 +00:00