LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,293 Commits 2 Branches 0 Tags
e66b671dc72d62ca12dcb73fd4d3d6386dacabca
Commit Graph

16293 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
8fbc5f53a6 am 058f1f0f: am 077d2052: am e3189c68: Update LayoutLib version for API 21 to 2. 
* commit '058f1f0fa00007bbd8856bf32c49db6f765dbca4':
  Update LayoutLib version for API 21 to 2.
 2014-11-10 22:19:04 +00:00
Deepanshu Gupta
058f1f0fa0 am 077d2052: am e3189c68: Update LayoutLib version for API 21 to 2. 
* commit '077d2052fdef5b71cc02a96a598eb3bb682f1294':
  Update LayoutLib version for API 21 to 2.
 2014-11-10 22:12:06 +00:00
Deepanshu Gupta
077d2052fd am e3189c68: Update LayoutLib version for API 21 to 2. 
* commit 'e3189c68b063090a1212a63e67348a86b05e837f':
  Update LayoutLib version for API 21 to 2.
 2014-11-10 21:57:00 +00:00
Deepanshu Gupta
e3189c68b0 Update LayoutLib version for API 21 to 2. 
Change-Id: Icb24cb56a34def1c550b7f38fe6f2943c49d3a03
 2014-11-10 20:19:15 +00:00
Elliott Hughes
6274085c47 am 27db85ff: Merge "Made development/scripts/stack work on Mac." 
* commit '27db85ff168f4d32d553fd85d03964d0c9daa25f':
  Made development/scripts/stack work on Mac.
 2014-11-08 19:09:19 +00:00
Elliott Hughes
27db85ff16 Merge "Made development/scripts/stack work on Mac." 2014-11-08 19:00:32 +00:00
Yang Ni
e4b2a1a959 Made development/scripts/stack work on Mac. 
Change-Id: I9be1e50c0a635068017326738af4f5c38dddddab
 2014-11-07 09:45:56 -08:00
Trevor Johns
fcd28181a1 sdk.atree: Disable Wear samples for lmp branches 
Wear samples are currently generated for the klp-modular branch only.

Change-Id: I127a75d171a31f334c5006b6ce251ff1d4f35f42
 2014-11-06 21:11:46 +00:00
Jim Miller
b7651e12c4 am 1064b49c: am eb7edd58: Merge "Update TrustAgentService API after review" into lmp-mr1-dev 
* commit '1064b49cedcf80bcfaf8bd6824fc8cabae256e99':
  Update TrustAgentService API after review
 2014-11-06 03:01:41 +00:00
Jim Miller
1064b49ced am eb7edd58: Merge "Update TrustAgentService API after review" into lmp-mr1-dev 
* commit 'eb7edd585abb0bc6c039882cdec8dc8a9fd4e4cc':
  Update TrustAgentService API after review
 2014-11-06 02:57:33 +00:00
Jim Miller
eb7edd585a Merge "Update TrustAgentService API after review" into lmp-mr1-dev 2014-11-06 02:52:51 +00:00
Adam Lesinski
d155da9790 Add split-select tool to SDK build. 
Change-Id: I3889cb62587cdd8479cd91cee2412703f90cd91c
 2014-11-05 11:34:03 -08:00
Dmitry Shmidt
850fe6a3af am 5cc7f9ba: am d00a0a73: Development: Connectivity: Fix receiver leakage 
* commit '5cc7f9ba4c610cab552d5f553a22ba4e959dd819':
  Development: Connectivity: Fix receiver leakage
 2014-11-04 03:42:19 +00:00
Dmitry Shmidt
5cc7f9ba4c am d00a0a73: Development: Connectivity: Fix receiver leakage 
* commit 'd00a0a734ef64ba917e5a124a16c1e4c196dd187':
  Development: Connectivity: Fix receiver leakage
 2014-11-04 03:32:37 +00:00
Jim Miller
d4adb57e07 Update TrustAgentService API after review 
Add test for DPM.setTrustAgentConfiguration()

Also fixes bug where DPM flags were set in onPreferenceChanged()
which happened before being set on the checkbox preference.

Fixes bug 17008504

Change-Id: I165cd73d11c0a68ee6667cb1fd88892a39267903
 2014-11-03 18:48:45 -08:00
Dmitry Shmidt
d00a0a734e Development: Connectivity: Fix receiver leakage 
Bug: 18229332

Change-Id: Iadd8a1a6e72cf762f6494b586b53b827edebd25d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2014-11-03 17:26:00 -08:00
Xavier Ducrohet
b00c359893 am f8a6d8f1: am 66b2f251: am 883b17b3: am 5b7f5d2b: Update build-tools revision. DO NOT MERGE. 
* commit 'f8a6d8f1df1f68a1db18ccf012b82aea4a563331':
  Update build-tools revision. DO NOT MERGE.
 2014-11-01 17:48:27 +00:00
Xavier Ducrohet
2dcf807247 am d150e285: am 4aceb725: am 754cfeb6: am 8641d4da: Move mulit-dex files around. 
* commit 'd150e285b5097fea8c5e2e7015e723437daf7f9d':
  Move mulit-dex files around.
 2014-11-01 17:48:19 +00:00
Xavier Ducrohet
f8a6d8f1df am 66b2f251: am 883b17b3: am 5b7f5d2b: Update build-tools revision. DO NOT MERGE. 
* commit '66b2f251c72c82098a2a84a2b87642e42c5d26b8':
  Update build-tools revision. DO NOT MERGE.
 2014-11-01 16:05:48 +00:00
Xavier Ducrohet
d150e285b5 am 4aceb725: am 754cfeb6: am 8641d4da: Move mulit-dex files around. 
* commit '4aceb7250d209b848b44a64984953e0d45c50b3e':
  Move mulit-dex files around.
 2014-11-01 16:05:43 +00:00
Xavier Ducrohet
66b2f251c7 am 883b17b3: am 5b7f5d2b: Update build-tools revision. DO NOT MERGE. 
* commit '883b17b351fca5459fdb26f640e411a552dae7d8':
  Update build-tools revision. DO NOT MERGE.
 2014-11-01 14:09:56 +00:00
Xavier Ducrohet
4aceb7250d am 754cfeb6: am 8641d4da: Move mulit-dex files around. 
* commit '754cfeb6f7baf2e5499959ac439a8a95400a9974':
  Move mulit-dex files around.
 2014-11-01 14:09:55 +00:00
Dmitriy Ivanov
bb4c3d05f3 am fc3c8256: am 7d4c9612: Merge changes I0666e671,I90a1aed6 
* commit 'fc3c82562d061dcfc5760817371b1c5d125d95a7':
  Do not call art-on macro by default.
  Add support for debugging ART to the dalvik.gdb script.
 2014-10-31 22:57:07 +00:00
Dmitriy Ivanov
fc3c82562d am 7d4c9612: Merge changes I0666e671,I90a1aed6 
* commit '7d4c96124ca1d9002c73d4b0faf40d03ca30fc77':
  Do not call art-on macro by default.
  Add support for debugging ART to the dalvik.gdb script.
 2014-10-31 22:51:40 +00:00
Dmitriy Ivanov
7d4c96124c Merge changes I0666e671,I90a1aed6 
* changes:
  Do not call art-on macro by default.
  Add support for debugging ART to the dalvik.gdb script.
 2014-10-31 22:46:59 +00:00
Xavier Ducrohet
883b17b351 am 5b7f5d2b: Update build-tools revision. DO NOT MERGE. 
* commit '5b7f5d2bc428cbd8b2bdbbafa00a57486808d77d':
  Update build-tools revision. DO NOT MERGE.
 2014-10-31 22:04:56 +00:00
Xavier Ducrohet
754cfeb6f7 am 8641d4da: Move mulit-dex files around. 
* commit '8641d4dada2166c116c7663e33f47b297993038e':
  Move mulit-dex files around.
 2014-10-31 22:04:55 +00:00
Xavier Ducrohet
5b7f5d2bc4 Update build-tools revision. DO NOT MERGE. 
Change-Id: I2b59607e7cb24e3c09a2eb430380443d9c3e64d5
 2014-10-31 13:48:51 -07:00
Xavier Ducrohet
8641d4dada Move mulit-dex files around. 
This allows the mainDexClasses to work by
finding shrinkedAndroid.jar and proguard (from
the SDK Tools folder) correctly.

Change-Id: Ib3d85f775876b8a487af04bd072f6d8877f31d3b
 2014-10-31 13:47:47 -07:00
Christopher Ferris
5661570266 Do not call art-on macro by default. 
If you are debugging a native process, SIGSEGV gets ignored by default.
The gdbclient bash function has been modified to only call the art-on
macro when running gdbclient app_processXX.

Also, print a warning in case someone is trying to debug a native
process using app_process.

Bug: 17815162
Change-Id: I0666e6713b0a03ee713be7827c5b671938f2c263
(cherry picked from commit 436b740b70)
 2014-10-31 12:33:57 -07:00
Dave Allison
187be4adee Add support for debugging ART to the dalvik.gdb script. 
This adds two commands:

art-on
art-off

To the gdbclient script for debugging ART-based executables in gdb.
The default is 'art-on'

Bug: 17409881
Change-Id: I90a1aed603e50853a40d5f5ec1c9b168dc17ddc7
(cherry picked from commit 22382a4774)
 2014-10-31 12:33:52 -07:00
Baligh Uddin
40653ae9bb am f82c5022: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit 'f82c5022739c49b4990a280f5f9fc1a9f2c05fe6':
  Import translations. DO NOT MERGE
 2014-10-31 17:20:59 +00:00
Baligh Uddin
f82c502273 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2014-10-31 17:10:01 +00:00
Baligh Uddin
1dfe52103f am 1baffe78: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '1baffe78ce3d9c6cc153d5cdf8ad18be3db8abb5':
  Import translations. DO NOT MERGE
 2014-10-31 17:07:57 +00:00
Baligh Uddin
1baffe78ce Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2014-10-31 17:01:29 +00:00
Tim Kilbourn
bd76973c0c am b029e4d4: am 2f6ded27: Add secondary text to cards. 
* commit 'b029e4d451730720d1b3ee56f782f8cc1fb652d4':
  Add secondary text to cards.
 2014-10-31 00:14:52 +00:00
Dake Gu
57e93e8c1b am 82435b27: am f66eadb5: SupportLeanbackDemo: Add test case for updating overview row 
* commit '82435b27f7dd8d5297989bd4d49591cd26ade3cb':
  SupportLeanbackDemo: Add test case for updating overview row
 2014-10-31 00:12:56 +00:00
Xavier Ducrohet
bf541eb510 am f75191cb: am 0d574614: am 25907e2a: am 8361bb0d: Update build-tools and support for multidex. 
* commit 'f75191cb3e61886f6666ec238c983263b75be91e':
  Update build-tools and support for multidex.
 2014-10-31 00:12:52 +00:00
Xavier Ducrohet
a008a5698a am 2c799e08: am e67c313e: am 9ccbed21: am 86d28ad8: Add jack/jill/multidex lib to build-tools. 
* commit '2c799e0856e4bd9b7ec5071f08fdf074750d05cc':
  Add jack/jill/multidex lib to build-tools.
 2014-10-31 00:12:47 +00:00
bohu
7122b3e99f am 8a29ecdd: am 5bedd192: am ccaaeb5f: am c01f2d39: Merge "Update system images to revision 3" into lmp-dev 
* commit '8a29ecdd5e356722e123da3e5a61df05fe04b707':
  Update system images to revision 3
 2014-10-31 00:12:44 +00:00
Xavier Ducrohet
501c9ac4af am 94f4c803: am 1770d4bd: am 17d47a10: am 5193f245: Merge "Update build tools version to 21.1.0. DO NOT MERGE." into lmp-dev 
* commit '94f4c803949778a594c1bbe64bf64a31a5fd3a71':
  Update build tools version to 21.1.0. DO NOT MERGE.
 2014-10-31 00:12:37 +00:00
Takeshi Hagikura
90f430c952 am 0ebad463: am e38db4c5: am 5350100b: am f6855153: Merge "resolved conflicts for merge of 3bb3da96 to lmp-dev" into lmp-dev 
* commit '0ebad4632dea62b8262f8cc807267c9159612438':
 2014-10-31 00:12:36 +00:00
Baligh Uddin
72d98225e5 Import translations. DO NOT MERGE 
Change-Id: I5874a7acf016c06931e064426cd73b83b79d9c26
Auto-generated-cl: translation import
 2014-10-30 15:45:57 -07:00
Andrew Hsieh
86437bbb65 am fbee7f97: am f8d4dfbf: Merge "Cherry-pick: Only use <atomic> for C++11 and newer" 
* commit 'fbee7f9704febbf81856e7d6d154f71381d95b06':
  Cherry-pick: Only use <atomic> for C++11 and newer
 2014-10-30 18:45:26 +00:00
Andrew Hsieh
fbee7f9704 am f8d4dfbf: Merge "Cherry-pick: Only use <atomic> for C++11 and newer" 
* commit 'f8d4dfbff6035e87e941cb75affac86c6d7e144e':
  Cherry-pick: Only use <atomic> for C++11 and newer
 2014-10-30 18:41:10 +00:00
Andrew Hsieh
f8d4dfbff6 Merge "Cherry-pick: Only use <atomic> for C++11 and newer" 2014-10-30 18:34:18 +00:00
Baligh Uddin
5fd0e38c0a Import translations. DO NOT MERGE 
Change-Id: Iefd0773327c4d0aa246381ea63b94b898cfcc75f
Auto-generated-cl: translation import
 2014-10-30 11:17:54 -07:00
Andrew Hsieh
add39dfea3 Cherry-pick: Only use <atomic> for C++11 and newer 
See bionic 3ce0769aa5f9a991af1d167f730d987dd002253c
BUG=17736764

Change-Id: If63b6c8394f8574fd198fd24dfc42a3aaba865d5
 2014-10-30 10:42:04 -07:00
Dake Gu
dc5cecd852 am 99cf1af3: am 455a4c3f: Merge "SupportLeanbackDemo: Add test case of ArrayObjectAdapter.replace()" into lmp-mr1-dev 
* commit '99cf1af3c1589d9e36a07868dc1eb0fed25b4395':
  SupportLeanbackDemo: Add test case of ArrayObjectAdapter.replace()
 2014-10-30 11:03:21 +00:00
Tim Kilbourn
b029e4d451 am 2f6ded27: Add secondary text to cards. 
* commit '2f6ded27f69c67b64b65e754beb56adc5ed651d0':
  Add secondary text to cards.
 2014-10-30 00:34:16 +00:00