drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,430 Commits 1 Branch 0 Tags
Commit Graph

176430 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ryosuke Matsuuchi
fea08ccdff am 3d1a37e9: am 38d969c5: am 558907f7: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs 
* commit '3d1a37e9ecffd89f61de27d924b0469a6a09ea8c':
  doc: Add Korean version of DAC/distribute/ page.
 2015-04-19 00:55:05 +00:00
Ryosuke Matsuuchi
3d1a37e9ec am 38d969c5: am 558907f7: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs 
* commit '38d969c5c85f930cefef6f2fcad99d5aa8a0d5f7':
  doc: Add Korean version of DAC/distribute/ page.
 2015-04-19 00:44:42 +00:00
Ryosuke Matsuuchi
38d969c5c8 am 558907f7: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs 
* commit '558907f702ab21d4166d5d7f7986cb18c4a993bd':
  doc: Add Korean version of DAC/distribute/ page.
 2015-04-19 00:32:53 +00:00
Ryosuke Matsuuchi
558907f702 am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs 
* commit '0d2f280310458d23618edf6550818f8f9cfa6b47':
  doc: Add Korean version of DAC/distribute/ page.
 2015-04-19 00:22:51 +00:00
Ryosuke Matsuuchi
0d2f280310 Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs 2015-04-19 00:15:12 +00:00
Dirk Dougherty
308cd16022 am 488e5bbc: am 1696552f: am 6e141199: am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs 
* commit '488e5bbc2333adb1c84be90b797e1a8d36d070c3':
  Doc change: distribute landing page.
 2015-04-18 23:54:58 +00:00
Dirk Dougherty
488e5bbc23 am 1696552f: am 6e141199: am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs 
* commit '1696552f127c82aed9036eb1fa6b44c826d57eec':
  Doc change: distribute landing page.
 2015-04-18 23:43:54 +00:00
Dirk Dougherty
1696552f12 am 6e141199: am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs 
* commit '6e141199874f0c5603dee4fccc728412dad07d61':
  Doc change: distribute landing page.
 2015-04-18 23:32:46 +00:00
Dirk Dougherty
6e14119987 am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs 
* commit 'ff233af75f2201c2724f8b388c39d3abeb8c6a2e':
  Doc change: distribute landing page.
 2015-04-18 23:22:48 +00:00
Dirk Dougherty
ff233af75f Merge "Doc change: distribute landing page." into lmp-docs 2015-04-18 23:11:42 +00:00
Dirk Dougherty
1792ec17b8 Doc change: distribute landing page. 
Change-Id: I7442760c79d2037c9ee51f52ebd15d8373b7e1be
 2015-04-18 16:00:23 -07:00
Sean Wan
d1a72651ed am b792f433: Merge "DO NOT MERGE: Make wifi scan interval when disconnected configurable." into lmp-mr1-modular-dev 
* commit 'b792f43301c61cce996dd5bac4589b4720a37bec':
  DO NOT MERGE: Make wifi scan interval when disconnected configurable.
 2015-04-17 23:55:21 +00:00
Sean Wan
b792f43301 Merge "DO NOT MERGE: Make wifi scan interval when disconnected configurable." into lmp-mr1-modular-dev 2015-04-17 23:45:37 +00:00
Sean Wan
79858a3260 DO NOT MERGE: Make wifi scan interval when disconnected configurable. 
Bug: 19335429
Change-Id: I167af190f0e448915f50d8edf853cf8a33646d44
 2015-04-17 16:08:59 -07:00
Dmitriy Ivanov
a04b43020e am b0557ace: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS" 
* commit 'b0557acebc7a47f6d8a3653c376165160fc68105':
  Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
 2015-04-17 19:20:22 +00:00
Dmitriy Ivanov
b0557acebc Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS" 2015-04-17 19:01:42 +00:00
Dmitriy Ivanov
811b7266fd Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS 
It is no longer needed.

Change-Id: I1b5a58528507df35cc0792a18be5583e3605cbe0
 2015-04-17 11:50:29 -07:00
Dan Albert
5682a23ed4 am fef8bcf9: Merge "Explicitly use clang." 
* commit 'fef8bcf92167fbfe06cfb4a18ddf12f272cae5f0':
  Explicitly use clang.
 2015-04-17 18:06:54 +00:00
Dan Albert
fef8bcf921 Merge "Explicitly use clang." 2015-04-17 17:43:36 +00:00
Dan Albert
b9f6b0eec3 Explicitly use clang. 
This was implicitly enabled by using ASAN.

Change-Id: I562402a8191e2a3ab3eefd43860fbe7c58d441d8
 2015-04-17 10:40:48 -07:00
Rich Slogar
a9315dc16c am c1002dfc: am 71a616e0: am 203a4739: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs 
* commit 'c1002dfc52ec2827d24b6c4722a47abbb99b7f16':
  docs: studio remove gradle tasks dialog
 2015-04-17 17:37:51 +00:00
Rich Slogar
124c40252d am 1252b4b8: am 61dd1dfd: am 684f3aa2: am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs 
* commit '1252b4b8694a69150b79ecfd801ed62c6929edf3':
  docs: hierarchyviewer updates
 2015-04-17 17:37:45 +00:00
Rich Slogar
c1002dfc52 am 71a616e0: am 203a4739: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs 
* commit '71a616e05065e39a5a13b483b031a2040dc52eda':
  docs: studio remove gradle tasks dialog
 2015-04-17 17:27:13 +00:00
Rich Slogar
1252b4b869 am 61dd1dfd: am 684f3aa2: am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs 
* commit '61dd1dfda1e3f9d2c58a5d1719818b66134cadb9':
  docs: hierarchyviewer updates
 2015-04-17 17:27:07 +00:00
Rich Slogar
71a616e050 am 203a4739: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs 
* commit '203a47395dfc17ba9e9b6b46c65bfbde002312f6':
  docs: studio remove gradle tasks dialog
 2015-04-17 17:14:48 +00:00
Rich Slogar
61dd1dfda1 am 684f3aa2: am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs 
* commit '684f3aa264e678affc1b33b27602493c96ee7eac':
  docs: hierarchyviewer updates
 2015-04-17 17:14:43 +00:00
Rich Slogar
203a47395d am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs 
* commit '1fcc6bd854f6e152cf8796a4a70965e350c3bdcf':
  docs: studio remove gradle tasks dialog
 2015-04-17 17:03:04 +00:00
Rich Slogar
684f3aa264 am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs 
* commit 'efe861a4a7081da795fe6a0843308ca7cef26277':
  docs: hierarchyviewer updates
 2015-04-17 17:02:59 +00:00
Rich Slogar
1fcc6bd854 Merge "docs: studio remove gradle tasks dialog" into lmp-docs 2015-04-17 16:53:34 +00:00
Rich Slogar
efe861a4a7 Merge "docs: hierarchyviewer updates" into lmp-docs 2015-04-17 16:52:45 +00:00
Olawale Ogunwale
53e2c6ec87 am c0c8d198: Merge "[ActivityManager] Fix activity always visible." 
* commit 'c0c8d1983c5d7c9bc9469944a9d46856aff95ab9':
  [ActivityManager] Fix activity always visible.
 2015-04-17 16:13:03 +00:00
Olawale Ogunwale
c0c8d1983c Merge "[ActivityManager] Fix activity always visible." 2015-04-17 15:50:48 +00:00
Martijn Coenen
cb4776254c am e386f7f5: Merge "Expose peer LLCP version in NDEF callbacks." 
* commit 'e386f7f5108e9c2aa7547394f23d5936d7993cfe':
  Expose peer LLCP version in NDEF callbacks.
 2015-04-17 07:25:27 +00:00
Martijn Coenen
e386f7f510 Merge "Expose peer LLCP version in NDEF callbacks." 2015-04-17 07:02:59 +00:00
Ryosuke Matsuuchi
19a7b54619 doc: Add Korean version of DAC/distribute/ page. 
Bug: 20204101
Change-Id: I5a4795dd03ca4f904c26ce6138eb98d085dd3deb
 2015-04-17 10:57:31 +09:00
Filip Gruszczynski
47e743b9e2 am 4544b927: Hold a wake lock while dozing when wallpaper draws. 
* commit '4544b927d7f3575bf609490b42d521a12bf95a07':
  Hold a wake lock while dozing when wallpaper draws.
 2015-04-17 00:59:39 +00:00
Chad Brubaker
a9d740003f am e5e49a17: Merge "Support KM_LONG_REP" 
* commit 'e5e49a175c27b95d6b8928ab435bfde9f9db3c81':
  Support KM_LONG_REP
 2015-04-16 22:23:29 +00:00
Filip Gruszczynski
4544b927d7 Hold a wake lock while dozing when wallpaper draws. 
This mimics what ViewRootImpl does before drawing.

Bug: 20242788
Change-Id: If85ad17113636f74267aedb3af04d0281b57ac0e
 2015-04-16 15:00:58 -07:00
Chad Brubaker
e5e49a175c Merge "Support KM_LONG_REP" 2015-04-16 21:56:13 +00:00
Chad Brubaker
b543b39354 Support KM_LONG_REP 
Change-Id: I37814bcb03dc8918e27226ec43230fa4218723d0
 2015-04-16 14:39:51 -07:00
Alex Klyubin
51884f0e06 am 499126c4: Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant." 
* commit '499126c43385ba7bce9b8547b61bafd0c6311147':
  Add Keymaster KM_ORIGIN_UNKNOWN constant.
 2015-04-16 20:09:05 +00:00
Alex Klyubin
499126c433 Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant." 2015-04-16 19:50:12 +00:00
Deepanshu Gupta
c4affce9df am 1f3c7f3f: am f18ceefc: am cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev 
* commit '1f3c7f3f500bdbfd790c20872961d84ef617f066':
  Update golden image for tests.
  Update to using LayoutlibCallback.
  Remove implementation of deprecated method.
  Add @empty support.
 2015-04-16 17:41:54 +00:00
Deepanshu Gupta
1f3c7f3f50 am f18ceefc: am cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev 
* commit 'f18ceefcf0d3cc91e74737e0a93f16775e3bf18b':
  Update golden image for tests.
  Update to using LayoutlibCallback.
  Remove implementation of deprecated method.
  Add @empty support.
 2015-04-16 17:31:34 +00:00
Brian Carlstrom
40955edf9d am 14a982aa: Merge "Document hprof-conv -z" 
* commit '14a982aa7a38fa89c916c252996632d401b1d043':
  Document hprof-conv -z
 2015-04-16 17:31:34 +00:00
Deepanshu Gupta
f18ceefcf0 am cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev 
* commit 'cd6e00c6d973af350f4bb0de5d85fed7e299d9e8':
  Update golden image for tests.
  Update to using LayoutlibCallback.
  Remove implementation of deprecated method.
  Add @empty support.
 2015-04-16 17:19:42 +00:00
Deepanshu Gupta
cd6e00c6d9 Merge changes from topic 'layoutlib-api-15' into lmp-mr1-dev 
* changes:
  Update golden image for tests.
  Update to using LayoutlibCallback.
  Remove implementation of deprecated method.
  Add @empty support.
 2015-04-16 17:12:45 +00:00
Brian Carlstrom
14a982aa7a Merge "Document hprof-conv -z" 2015-04-16 17:08:00 +00:00
Brian Carlstrom
d7931acf4a Document hprof-conv -z 
Bug: 18473132
Change-Id: I3c0fcc2c15d4c590ed852f41aa4fd2a2531a6db8
 2015-04-16 10:06:58 -07:00
Alex Klyubin
a2607ee4eb am b9a78c79: Merge "Add IV-related Keymaster error codes." 
* commit 'b9a78c7939e9b31c807106166cafe65dc5af777d':
  Add IV-related Keymaster error codes.
 2015-04-16 16:57:12 +00:00