Commit Graph

19775 Commits

Author SHA1 Message Date
Vince Harron
54bf97d1a2 Fix for IllegalMonitorStateException in Cache Abuser
am: d1731fc

* commit 'd1731fc950acc5ed1bfb196addc51ea2dd692265':
  Fix for IllegalMonitorStateException in Cache Abuser
2016-03-18 23:53:11 +00:00
Vince Harron
d1731fc950 Fix for IllegalMonitorStateException in Cache Abuser
AsyncTask.wait was being called outside of a synchronize block,
causing an IllegalMonitorStateException.  This replaces the wait
with a Thread.sleep.

BUG=b.android.com/203846

Change-Id: Ib370f702c1e0f76657292955de2406ce7f065e69
2016-03-18 16:40:49 -07:00
Yohann Roussel
3de932b2aa Package Jack and Jill directly from prebuilt
am: 26707bf

* commit '26707bffbfbc85ecd0d236bba45ad9a94518f29c':
  Package Jack and Jill directly from prebuilt
2016-03-18 12:28:42 +00:00
Yohann Roussel
26707bffbf Package Jack and Jill directly from prebuilt
Instead of taking it from out.

Bug: 27372042

(cherry picked from commit 6f5779692a)

Change-Id: I9cc798e37655c8e86bf781c42c7b57b76070a1fd
2016-03-18 11:39:37 +01:00
Yohann Roussel
2e8682bfaa Merge "Package Jack and Jill directly from prebuilt"
am: 241e156

* commit '241e1565faed018590fd618b92351a9f47bf4e12':
  Package Jack and Jill directly from prebuilt
2016-03-18 09:32:10 +00:00
Yohann Roussel
241e1565fa Merge "Package Jack and Jill directly from prebuilt" 2016-03-18 08:54:30 +00:00
Maurice Lam
5baa0bf544 Merge "Add custom config XML support for checkstyle" into nyc-dev
am: f98b371

* commit 'f98b3710206d5fa58a8914bf05bf649cb85d1239':
  Add custom config XML support for checkstyle
2016-03-17 17:32:00 +00:00
Yohann Roussel
6f5779692a Package Jack and Jill directly from prebuilt
Instead of taking it from out.

Bug: 27372042
Change-Id: Ie266104e51c09fa21ccb09c1f27ad7068472965c
2016-03-17 15:16:25 +01:00
Maurice Lam
f98b371020 Merge "Add custom config XML support for checkstyle" into nyc-dev 2016-03-16 23:33:48 +00:00
Maurice Lam
d513a1723f Add custom config XML support for checkstyle
Change-Id: If94dd073d7270d8fcdcf4f3041770712a193ce9e
2016-03-16 14:53:15 -07:00
Kirill Grouchnikov
d7a74d74f1 Sample code for using custom views in TabLayout tabs
am: c5d7529

* commit 'c5d75291239366afa45a470b882ed3462ddc014a':
  Sample code for using custom views in TabLayout tabs
2016-03-16 20:11:26 +00:00
Kirill Grouchnikov
c5d7529123 Sample code for using custom views in TabLayout tabs
Change-Id: I5623729e52bd701914f84e3fd41fa3e5c71245b8
2016-03-16 11:55:03 -04:00
Christopher Ferris
b0f2c2063a Find abi before trying to decode the stack.
am: b8e1760d79

* commit 'b8e1760d79844a95eeffa42fc678ccd3cd5c8298':
  Find abi before trying to decode the stack.
2016-03-16 02:16:17 +00:00
Christopher Ferris
975d372e42 Merge "Find abi before trying to decode the stack."
am: 782e50b099

* commit '782e50b099234cde4f18e32de9383eac906dc186':
  Find abi before trying to decode the stack.
2016-03-16 02:09:19 +00:00
Christopher Ferris
b8e1760d79 Find abi before trying to decode the stack.
The CallStack function prints stacks to the log. Unfortunately, our
stack script defaults to arm, so if the data is actually arm64, we'll
do nothing. Modify the script to parse the input trying to determine
the abi before processing the rest of the lines. At the very least,
we'll be able to correctly choose between arm and arm64.

The only downside, is that, the old method could take dumps from different
abis, but no one I know does this.

Bug: 26569638

(cherry picked from commit bf8a940234)

Change-Id: I8dba5cc4910c4a81996999b8699915f1d55b4979
2016-03-15 19:05:15 -07:00
Christopher Ferris
782e50b099 Merge "Find abi before trying to decode the stack." 2016-03-16 02:02:44 +00:00
Dake Gu
fe370c9a17 LeanbackDemo: Search requests runtime permission
am: a070f85677

* commit 'a070f85677e85b490f2f904374c89e92bf40fabc':
  LeanbackDemo: Search requests runtime permission
2016-03-16 01:33:02 +00:00
Dake Gu
a070f85677 LeanbackDemo: Search requests runtime permission
Bug: 23958590
Change-Id: I058b80050285b9912fefbcaca3f897f8a6b87b3d
2016-03-15 18:30:16 -07:00
Christopher Ferris
bf8a940234 Find abi before trying to decode the stack.
The CallStack function prints stacks to the log. Unfortunately, our
stack script defaults to arm, so if the data is actually arm64, we'll
do nothing. Modify the script to parse the input trying to determine
the abi before processing the rest of the lines. At the very least,
we'll be able to correctly choose between arm and arm64.

The only downside, is that, the old method could take dumps from different
abis, but no one I know does this.

Bug: 26569638
Change-Id: I5935b82fe0af1e788b0d3edc535b9f0cbb7d1b28
2016-03-15 16:25:19 -07:00
Makoto Onuki
596b8c7eaa Merge "Don\'t override the setting activity shortcut" into nyc-dev
am: 8950c62362

* commit '8950c62362d35c96c03bac5a411dca042e044733':
  Don't override the setting activity shortcut
2016-03-15 20:12:16 +00:00
Makoto Onuki
8950c62362 Merge "Don't override the setting activity shortcut" into nyc-dev 2016-03-15 20:04:36 +00:00
susnata
5d8fdb3b84 Merge "Adding page fragment inside BrowseFragment demo" into nyc-dev
am: 8689804cc9

* commit '8689804cc90c88bb360abed5a78109a8493d287d':
  Adding page fragment inside BrowseFragment demo
2016-03-15 18:45:39 +00:00
Susnata Basak
8689804cc9 Merge "Adding page fragment inside BrowseFragment demo" into nyc-dev 2016-03-15 18:37:45 +00:00
susnata
b0a80e28d5 Adding page fragment inside BrowseFragment demo
Change-Id: If6f453f2398d8fc5beba16e2a2e126566b9b65e2
2016-03-15 11:22:16 -07:00
Makoto Onuki
ed8e4d8529 Don't override the setting activity shortcut
- Also dump updated shortcuts on logcat

Bug 27548047

Change-Id: Id6a80e518dd801f530bbd30b6379ed86d7cf8a2b
2016-03-15 11:10:23 -07:00
Makoto Onuki
d288063936 Don\'t use the launcher shortcut APIs when not allowed.
am: 05b869cfcc

* commit '05b869cfcc862f986029cb2f1bf8e67183620d25':
  Don't use the launcher shortcut APIs when not allowed.
2016-03-15 00:44:37 +00:00
Makoto Onuki
05b869cfcc Don't use the launcher shortcut APIs when not allowed.
Bug 27548047

Change-Id: Ie9f85b1662be9b071458180c128554711642e55e
2016-03-14 15:14:40 -07:00
Miao Wang
e741d92fa0 [RenderScript] Use librsrt_ARCH.bc instead of libclcore.bc am: a3ec5f3444 am: d54252e000 am: bd24e8e6c9 am: fc69b07d7a
am: fafcfeb5e1

* commit 'fafcfeb5e16d21db3466196bba4bfefe0fa42eea':
  [RenderScript] Use librsrt_ARCH.bc instead of libclcore.bc
2016-03-14 18:25:31 +00:00
Miao Wang
fafcfeb5e1 [RenderScript] Use librsrt_ARCH.bc instead of libclcore.bc am: a3ec5f3444 am: d54252e000 am: bd24e8e6c9
am: fc69b07d7a

* commit 'fc69b07d7accbb5f0a7d0616a7ba9e98bebd0f59':
  [RenderScript] Use librsrt_ARCH.bc instead of libclcore.bc
2016-03-14 18:22:57 +00:00
Miao Wang
fc69b07d7a [RenderScript] Use librsrt_ARCH.bc instead of libclcore.bc am: a3ec5f3444 am: d54252e000
am: bd24e8e6c9

* commit 'bd24e8e6c9c68c3fa7ef98e43d8106502b9a9db2':
  [RenderScript] Use librsrt_ARCH.bc instead of libclcore.bc
2016-03-14 18:20:56 +00:00
Miao Wang
bd24e8e6c9 [RenderScript] Use librsrt_ARCH.bc instead of libclcore.bc am: a3ec5f3444
am: d54252e000

* commit 'd54252e00072f145becc4764444c5253214ca650':
  [RenderScript] Use librsrt_ARCH.bc instead of libclcore.bc
2016-03-14 18:18:56 +00:00
Miao Wang
22f6d27cde [RenderScript] Use librsrt_ARCH.bc instead of libclcore.bc
am: 7c02764a19

* commit '7c02764a198c5c4042e39eef21295e6b263f6c6b':
  [RenderScript] Use librsrt_ARCH.bc instead of libclcore.bc
2016-03-14 18:16:41 +00:00
Miao Wang
d54252e000 [RenderScript] Use librsrt_ARCH.bc instead of libclcore.bc
am: a3ec5f3444

* commit 'a3ec5f3444e48a1fa94435eed803a2f0576e6605':
  [RenderScript] Use librsrt_ARCH.bc instead of libclcore.bc
2016-03-14 18:16:41 +00:00
Miao Wang
7c02764a19 [RenderScript] Use librsrt_ARCH.bc instead of libclcore.bc
Bug: 19800082

  - Use librsrt_ARCH.bc for bcc-compat
  - Rename librsrt_ARCH.bc to libclcore.bc when packaging BuildTools, to
    maintain compatibility with old gradle-plugin.

Change-Id: I567935bd6ec8f6c3b91510b2a7db6d05ec895a92
2016-03-14 18:06:08 +00:00
Miao Wang
a3ec5f3444 [RenderScript] Use librsrt_ARCH.bc instead of libclcore.bc
Bug: 19800082

  - Use librsrt_ARCH.bc for bcc-compat
  - Rename librsrt_ARCH.bc to libclcore.bc when packaging BuildTools, to
    maintain compatibility with old gradle-plugin.

Change-Id: I567935bd6ec8f6c3b91510b2a7db6d05ec895a92
2016-03-11 21:51:49 -08:00
Adam Lesinski
d41dc72498 Merge "Add AAPT2 to SDK build" into nyc-dev
am: 5b90d3715f

* commit '5b90d3715fc81e44d0972d2ce3319d60d732efce':
  Add AAPT2 to SDK build
2016-03-11 23:48:53 +00:00
Adam Lesinski
5b90d3715f Merge "Add AAPT2 to SDK build" into nyc-dev 2016-03-11 21:33:51 +00:00
Lorenzo Colitti
e6d4f84222 Merge "Change the Development app to use a lambda." into nyc-dev
am: 40a583c79b

* commit '40a583c79b318ab6ec2b5aaf90ebfd4a6dc2530d':
  Change the Development app to use a lambda.
2016-03-11 10:40:17 +00:00
Neil Fuller
40a583c79b Merge "Change the Development app to use a lambda." into nyc-dev 2016-03-11 10:33:28 +00:00
Lorenzo Colitti
503abedac9 Change the Development app to use a lambda.
This is a cherry pick and modification of
commit 17f05f5820.

Bug: 26753820
Change-Id: I55419fac85196d86d548d455880d897015d8ea84
2016-03-11 10:31:35 +00:00
Adam Lesinski
355f971d42 Add AAPT2 to SDK build
Change-Id: I5e4072385ad7cbf86b435571b5e6149270c5eb1e
2016-03-10 20:08:15 -08:00
susnata
90b1d8f1b4 Merge "Adding PageRow to BrowseFragment demo." into nyc-dev
am: d91a35d096

* commit 'd91a35d096473bcdbf84a21d32249f72b3e55539':
  Adding PageRow to BrowseFragment demo.
2016-03-11 02:44:19 +00:00
Susnata Basak
d91a35d096 Merge "Adding PageRow to BrowseFragment demo." into nyc-dev 2016-03-11 02:38:35 +00:00
Xavier Ducrohet
d14c8a052f Update build tools to 24 rc2
am: 76fede5586

* commit '76fede5586774ee2700e543303c5d69054e84cab':
  Update build tools to 24 rc2
2016-03-11 02:05:00 +00:00
Xavier Ducrohet
76fede5586 Update build tools to 24 rc2
Change-Id: I3b77eb79c567a93d7d1b0c6cabece3f839a2c758
2016-03-10 17:54:46 -08:00
Xavier Ducrohet
bf084d1c0f Update build tools version to 23.0.3 - DO NOT MERGE. am: f50c50b371 am: 5d60951428 am: fde726ea06 am: 1f084fef50 -s ours
am: d9c18471cb

* commit 'd9c18471cb84613531bc4c9c318ba6e1a84ab6b0':
  Update build tools version to 23.0.3 - DO NOT MERGE.
2016-03-11 01:42:37 +00:00
Xavier Ducrohet
d9c18471cb Update build tools version to 23.0.3 - DO NOT MERGE. am: f50c50b371 am: 5d60951428 am: fde726ea06
am: 1f084fef50  -s ours

* commit '1f084fef50e56daa54d5af4a32d918b061d7f4df':
  Update build tools version to 23.0.3 - DO NOT MERGE.
2016-03-11 01:39:53 +00:00
Xavier Ducrohet
1f084fef50 Update build tools version to 23.0.3 - DO NOT MERGE. am: f50c50b371 am: 5d60951428
am: fde726ea06

* commit 'fde726ea0639b6cbc41fc17f9182be60a047762b':
  Update build tools version to 23.0.3 - DO NOT MERGE.
2016-03-11 01:37:07 +00:00
Xavier Ducrohet
fde726ea06 Update build tools version to 23.0.3 - DO NOT MERGE. am: f50c50b371
am: 5d60951428

* commit '5d609514284ef79b610f6b217ab67a1a9e198322':
  Update build tools version to 23.0.3 - DO NOT MERGE.
2016-03-11 01:34:22 +00:00
Xavier Ducrohet
5d60951428 Update build tools version to 23.0.3 - DO NOT MERGE.
am: f50c50b371

* commit 'f50c50b37197a311850e9bd536d2335b95647db5':
  Update build tools version to 23.0.3 - DO NOT MERGE.
2016-03-11 01:31:37 +00:00