LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,862 Commits 2 Branches 0 Tags
65f5b5bbda00dfb44b34f4caf6109e37d75ef70c
Commit Graph

12862 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
5f40b7f6b1 merge in klp-release history after reset to klp-dev 2013-08-20 06:00:56 -07:00
Jeff Brown
301b56fe9c am 89e2ff49: am bd278677: Merge "Fix NPE in sample code." into klp-dev 
* commit '89e2ff4986f65198e2b7ee65333e6744ca2dfe55':
  Fix NPE in sample code.
 2013-08-19 13:39:53 -07:00
Jeff Brown
89e2ff4986 am bd278677: Merge "Fix NPE in sample code." into klp-dev 
* commit 'bd278677694ae13e1a6d532a9bab954f74bba4b0':
  Fix NPE in sample code.
 2013-08-19 13:38:21 -07:00
Jeff Brown
bd27867769 Merge "Fix NPE in sample code." into klp-dev 2013-08-19 20:36:42 +00:00
Tom O'Neill
3b8f424558 Settings injector sample activity 
- Tests implementation of b/10287745

Change-Id: I5bf3323be78a16b660eadb96eadc6bf29197ace5
 2013-08-19 13:13:34 -07:00
Baligh Uddin
ca887dcce7 Merge "Import translations. DO NOT MERGE" 2013-08-19 19:52:50 +00:00
Baligh Uddin
a2ab2642d9 Merge "Import translations. DO NOT MERGE" 2013-08-19 19:52:17 +00:00
Vinit Deshapnde
e739d27975 am 0f268d09: am 24fa6aa6: Merge "Expose WifiManager.setTdlsEnabled public API" into klp-dev 
* commit '0f268d0935db91fb8f1653b3db44e612847d78a6':
  Expose WifiManager.setTdlsEnabled public API
 2013-08-19 12:20:53 -07:00
Vinit Deshapnde
0f268d0935 am 24fa6aa6: Merge "Expose WifiManager.setTdlsEnabled public API" into klp-dev 
* commit '24fa6aa6d9d04fc0cde8febb8eb46f731712542f':
  Expose WifiManager.setTdlsEnabled public API
 2013-08-19 12:19:15 -07:00
Vinit Deshapnde
24fa6aa6d9 Merge "Expose WifiManager.setTdlsEnabled public API" into klp-dev 2013-08-19 19:14:04 +00:00
Baligh Uddin
970abae927 Import translations. DO NOT MERGE 
Change-Id: I0c334e86677a2418afb7b0003db3a55f534bbe36
Auto-generated-cl: translation import
 2013-08-19 11:53:06 -07:00
Baligh Uddin
4c953afc9a Import translations. DO NOT MERGE 
Change-Id: I16b13f9ab686ae7957542698a6a917848e599b03
Auto-generated-cl: translation import
 2013-08-19 11:46:04 -07:00
The Android Automerger
179a6c3b9a merge in klp-release history after reset to klp-dev 2013-08-19 06:01:14 -07:00
Jeff Brown
5768b156c2 Fix NPE in sample code. 
Change-Id: I61b348192cd39813027ae5b4d2cedb2e84b701f1
 2013-08-16 21:07:09 -07:00
Vinit Deshapnde
9bfdb7e110 Expose WifiManager.setTdlsEnabled public API 
Bug: 10221775

Change-Id: I559e4a2afd525a03c8a13fd151eca4638426d03e
 2013-08-16 17:20:45 -07:00
Trevor Johns
c9e1ed46a8 am 2babdc60: am 7fb77fa7: am 092959b2: am 1edc4427: am 6a3067db: Merge "Add common directory to BasicSyncAdapter sample" into jb-mr2-dev 
* commit '2babdc60d2f9d482d3518f30035777fbff422a1e':
  Add common directory to BasicSyncAdapter sample
 2013-08-15 15:32:04 -07:00
Trevor Johns
2babdc60d2 am 7fb77fa7: am 092959b2: am 1edc4427: am 6a3067db: Merge "Add common directory to BasicSyncAdapter sample" into jb-mr2-dev 
* commit '7fb77fa79a43fed5fc9558e69944b29681544cba':
  Add common directory to BasicSyncAdapter sample
 2013-08-15 15:29:28 -07:00
Trevor Johns
7fb77fa79a am 092959b2: am 1edc4427: am 6a3067db: Merge "Add common directory to BasicSyncAdapter sample" into jb-mr2-dev 
* commit '092959b2a1d876511410cc6a85576545457d1037':
  Add common directory to BasicSyncAdapter sample
 2013-08-15 15:26:29 -07:00
Trevor Johns
092959b2a1 am 1edc4427: am 6a3067db: Merge "Add common directory to BasicSyncAdapter sample" into jb-mr2-dev 
* commit '1edc4427a1c4861b030bbd0d431f3e19f2fc2450':
  Add common directory to BasicSyncAdapter sample
 2013-08-15 15:23:03 -07:00
Trevor Johns
1edc4427a1 am 6a3067db: Merge "Add common directory to BasicSyncAdapter sample" into jb-mr2-dev 
* commit '6a3067db2014f3e582db8243bb82a4c1aad5bd07':
  Add common directory to BasicSyncAdapter sample
 2013-08-15 15:19:38 -07:00
Trevor Johns
6a3067db20 Merge "Add common directory to BasicSyncAdapter sample" into jb-mr2-dev 2013-08-15 22:15:11 +00:00
The Android Automerger
dee9d9e43c merge in klp-release history after reset to klp-dev 2013-08-15 06:00:39 -07:00
The Android Open Source Project
9485b911ca am 2663b14f: (-s ours) Reconcile with klp-release - do not merge 
* commit '2663b14f0f31038d718bbfe0fc203c1b792fcf47':
  Revert "Monkey support for swipes from the sides of a device."
 2013-08-14 15:14:37 -07:00
The Android Open Source Project
2663b14f0f Reconcile with klp-release - do not merge 
Change-Id: I81b4f63de93e75fa9553ffce9c2a8de697ca6d50
 2013-08-14 15:10:02 -07:00
Chong Zhang
467774b3fd am 3f5aec9c: am 678188ae: am 0efb0345: am 620b29a5: media router sample: handle remote volume change 
* commit '3f5aec9ce3432d9cebd7e8c684578e31755d2d76':
  media router sample: handle remote volume change
 2013-08-14 13:12:37 -07:00
Chong Zhang
3f5aec9ce3 am 678188ae: am 0efb0345: am 620b29a5: media router sample: handle remote volume change 
* commit '678188aee0b5b9156403ad03e214aef498aaee25':
  media router sample: handle remote volume change
 2013-08-14 13:10:33 -07:00
Chong Zhang
678188aee0 am 0efb0345: am 620b29a5: media router sample: handle remote volume change 
* commit '0efb03459019ef2aca41e94fe14366199a363597':
  media router sample: handle remote volume change
 2013-08-14 13:07:14 -07:00
Chong Zhang
0efb034590 am 620b29a5: media router sample: handle remote volume change 
* commit '620b29a566e87ce7bb21223150ff97f919fee836':
  media router sample: handle remote volume change
 2013-08-14 13:03:29 -07:00
Chong Zhang
620b29a566 media router sample: handle remote volume change 
Change-Id: Ie31c24d80b0ae74d68e3ff6f6098d4f0219c391d
(cherry picked from commit 4917691795)
 2013-08-14 19:58:57 +00:00
Chong Zhang
9fe422d9d2 Merge "media router sample: handle remote volume change" 2013-08-14 19:58:30 +00:00
Tor Norbye
64e3164434 Merge "Add typedef removal tool" 2013-08-14 17:12:54 +00:00
The Android Automerger
64d30f9b52 merge in klp-release history after reset to klp-dev 2013-08-14 06:05:04 -07:00
Chong Zhang
4917691795 media router sample: handle remote volume change 
Change-Id: Ie31c24d80b0ae74d68e3ff6f6098d4f0219c391d
 2013-08-13 19:12:17 -07:00
Xavier Ducrohet
87bb83ca14 am c5f94733: am f6e246a8: am 40e5d9df: am bc516abe: am 8791785c: Package Renderscript files for support mode. 
* commit 'c5f9473323336efbcc0cbad953aaf357107a5cef':
  Package Renderscript files for support mode.
 2013-08-13 17:10:48 -07:00
Xavier Ducrohet
c5f9473323 am f6e246a8: am 40e5d9df: am bc516abe: am 8791785c: Package Renderscript files for support mode. 
* commit 'f6e246a8350492eceab4533e0f91e7f9fa4ae91b':
  Package Renderscript files for support mode.
 2013-08-13 17:09:12 -07:00
Xavier Ducrohet
f6e246a835 am 40e5d9df: am bc516abe: am 8791785c: Package Renderscript files for support mode. 
* commit '40e5d9df5f6f7936ef1b08cfe00d2dfe4c874c8e':
  Package Renderscript files for support mode.
 2013-08-13 17:06:21 -07:00
Xavier Ducrohet
40e5d9df5f am bc516abe: am 8791785c: Package Renderscript files for support mode. 
* commit 'bc516abe801272ebbb6916f6496ef5ca88a20c0f':
  Package Renderscript files for support mode.
 2013-08-13 17:04:07 -07:00
Xavier Ducrohet
bc516abe80 am 8791785c: Package Renderscript files for support mode. 
* commit '8791785cd0e7eec775382d44c3ebfe9edaf54ca6':
  Package Renderscript files for support mode.
 2013-08-13 17:02:47 -07:00
Xavier Ducrohet
8791785cd0 Package Renderscript files for support mode. 
Change-Id: I4eae052b01ae014f3e4d289ba33893dfd9c43309
 2013-08-13 15:57:08 -07:00
Tor Norbye
11835f7fcb Add typedef removal tool 
The rmtypedefs tool is inteded only for the Android build itself.

It is given a set of .class file folders, and it finds any .class
files within those folders that correspond to "typedef annotations":
these are annotation classes that themselves have been annotated with
@IntDef or @StringDef. These typedefs should all be using
@Retention(RetentionPolicy.SOURCE), something this tool will check and
report if not the case.

However, even if an annotation only has source level retention, the
annotation class *itself*, will still be created as a .class file.  We
don't want these annotations in the Android system image, so this tool
is used to find and nuke the corresponding .class files for the
annotations themselves.

Change-Id: Ia343cc5bdbf215ded24b4354f3d92f5a9076eae3
 2013-08-13 14:56:13 -07:00
The Android Automerger
46d6ef5a3e merge in klp-release history after reset to klp-dev 2013-08-13 06:01:01 -07:00
Andrew Hsieh
abb260a280 am a79d5399: am fa73c847: am 54723fb6: Merge "Remove missing functions imaxabs() and imaxdiv() from inttypes.h" 
* commit 'a79d5399f07860f713a67b1798c8cce2a4456dd3':
  Remove missing functions imaxabs() and imaxdiv() from inttypes.h
 2013-08-12 20:33:40 -07:00
Andrew Hsieh
a79d5399f0 am fa73c847: am 54723fb6: Merge "Remove missing functions imaxabs() and imaxdiv() from inttypes.h" 
* commit 'fa73c847c34a442e24dbeeff4ae58799b66da97a':
  Remove missing functions imaxabs() and imaxdiv() from inttypes.h
 2013-08-12 20:31:57 -07:00
Andrew Hsieh
fa73c847c3 am 54723fb6: Merge "Remove missing functions imaxabs() and imaxdiv() from inttypes.h" 
* commit '54723fb6ac38cbefd2dbaf8c1e7a892765170d4c':
  Remove missing functions imaxabs() and imaxdiv() from inttypes.h
 2013-08-12 20:29:07 -07:00
Andrew Hsieh
54723fb6ac Merge "Remove missing functions imaxabs() and imaxdiv() from inttypes.h" 2013-08-13 03:26:13 +00:00
Adam Powell
3248353d28 am ba321696: am e1d4743d: am 3c16ec88: Fix bugs in FragmentLayoutSupport sample in Support4Demos 
* commit 'ba321696ddceb7996300cf7fe8027349ea9c9671':
  Fix bugs in FragmentLayoutSupport sample in Support4Demos
 2013-08-12 15:52:03 -07:00
Adam Powell
ba321696dd am e1d4743d: am 3c16ec88: Fix bugs in FragmentLayoutSupport sample in Support4Demos 
* commit 'e1d4743db13fc4f99f4608876f36d0e44e3f854a':
  Fix bugs in FragmentLayoutSupport sample in Support4Demos
 2013-08-12 14:02:15 -07:00
Adam Powell
e1d4743db1 am 3c16ec88: Fix bugs in FragmentLayoutSupport sample in Support4Demos 
* commit '3c16ec88559377128adffbc9748c23de79d7adb5':
  Fix bugs in FragmentLayoutSupport sample in Support4Demos
 2013-08-12 13:59:09 -07:00
Adam Powell
3c16ec8855 Fix bugs in FragmentLayoutSupport sample in Support4Demos 
Change-Id: I6b2828f8f6510e34cc11c3dc24b5022b241bd542
 2013-08-12 13:50:02 -07:00
Xavier Ducrohet
7c0bc8699d am 17f5e461: (-s ours) am 7353e9f3: (-s ours) am a6b4e7e3: am f46f1a97: Move build tools version to 18.1.0 - do not merge. 
* commit '17f5e461746c952d9d8aa439b3aaa0e70ca7f9b4':
  Move build tools version to 18.1.0 - do not merge.
 2013-08-12 11:13:31 -07:00