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

154701 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Hao
2e594cfe98 Change boot screen title to "Android is starting" when not upgrading. 
Bug: 17565501
Bug: 18247218

(cherry picked from commit 9f60c08a446e38f9e2d5271546ef69ca5941eba9)

Change-Id: I1ec32b318b6221277fc3ffbc19966bf3330c2d93
 2014-11-05 23:51:42 +00:00
Justin Koh
b8038d58da Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev 2014-11-05 23:49:04 +00:00
Dirk Dougherty
c6f2ec20a6 am b2fe15f9: am 66296451: Merge "Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices." into lmp-docs 
* commit 'b2fe15f9bf6ea06bd4c862547f830c355d95c60a':
  Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices.
 2014-11-05 22:57:36 +00:00
Dirk Dougherty
b2fe15f9bf am 66296451: Merge "Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices." into lmp-docs 
* commit '662964511f88fddbf14941c66bf255acb3f30e2a':
  Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices.
 2014-11-05 22:51:31 +00:00
Dirk Dougherty
662964511f Merge "Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices." into lmp-docs 2014-11-05 22:44:23 +00:00
Dirk Dougherty
df4c4ac540 Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices. 
Change-Id: Ib4c0b0d442b1ef879cb01b3972845ef93360c5b8
 2014-11-05 14:08:58 -08:00
John Spurlock
c2a0d9e54e am 66c46c4a: am 3a9321d4: Docs: Fix typo in Preference android:order attribute. 
* commit '66c46c4a9289a8e21c8f36fe06679be5f6534841':
  Docs: Fix typo in Preference android:order attribute.
 2014-11-05 21:40:46 +00:00
John Spurlock
66c46c4a92 am 3a9321d4: Docs: Fix typo in Preference android:order attribute. 
* commit '3a9321d407f71fa6c2a49db63e6eb30003c8ef4c':
  Docs: Fix typo in Preference android:order attribute.
 2014-11-05 21:36:13 +00:00
John Spurlock
3a9321d407 Docs: Fix typo in Preference android:order attribute. 
Change-Id: Ib3a009ed1fba8396be1bd5055f4897b0cc7d8738
 2014-11-05 21:20:36 +00:00
Rich Slogar
c3d174a030 am 848d9125: am 1afa82dc: docs:remove sdk/ndk note 
* commit '848d912505079cc3cbd362a4333f0eabfac3c1c5':
  docs:remove  sdk/ndk note
 2014-11-05 20:17:55 +00:00
Rich Slogar
848d912505 am 1afa82dc: docs:remove sdk/ndk note 
* commit '1afa82dce06ec03bcc2f58c4e144ba25c2ea1b2d':
  docs:remove  sdk/ndk note
 2014-11-05 20:13:35 +00:00
Andrew Solovay
8d7d7b448f am 56576838: am d9ceae8f: Merge "docs: Removed broken link to non-existent method." into lmp-docs 
* commit '56576838a8e8c4f44f8df13cc40295a918540b86':
  docs: Removed broken link to non-existent method.
 2014-11-05 18:52:27 +00:00
Ricardo Cervera
b2f0f3514c am b4125d1e: am 58f1200c: Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs 
* commit 'b4125d1e0bbf1ce90d0bfb03e5e068180bbb6b20':
  docs: Add instructions to attach debugger to a running process.
 2014-11-05 18:52:23 +00:00
Andrew Solovay
56576838a8 am d9ceae8f: Merge "docs: Removed broken link to non-existent method." into lmp-docs 
* commit 'd9ceae8f9753a3a986ae0d24d4732c0167a6b2a9':
  docs: Removed broken link to non-existent method.
 2014-11-05 18:47:17 +00:00
Ricardo Cervera
b4125d1e0b am 58f1200c: Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs 
* commit '58f1200c333deea72ed6e095587f0bcb1fb65ce3':
  docs: Add instructions to attach debugger to a running process.
 2014-11-05 18:47:13 +00:00
Rich Slogar
1afa82dce0 docs:remove sdk/ndk note 
Change-Id: I3aaebdd14b0b26b041da3ee6872f84f311d4191b
 2014-11-05 10:46:50 -08:00
Andrew Solovay
d9ceae8f97 Merge "docs: Removed broken link to non-existent method." into lmp-docs 2014-11-05 18:14:05 +00:00
Ricardo Cervera
df37d45f13 Merge "docs: Add instructions to attach debugger to a running process." into lmp-dev 
automerge: 25a4e21

* commit '25a4e21e13217708e9ff99beb21f88151ea2cbd4':
  docs: Add instructions to attach debugger to a running process.
 2014-11-05 17:08:37 +00:00
Ricardo Cervera
58f1200c33 Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs 2014-11-05 17:00:10 +00:00
Ricardo Cervera
25a4e21e13 Merge "docs: Add instructions to attach debugger to a running process." into lmp-dev 2014-11-05 16:58:23 +00:00
Bryce Lee
5a818e55a7 Merge "Add config to control going to sleep when entering theater mode." into lmp-sprout-dev 2014-11-05 16:41:40 +00:00
Tom Taylor
89f7eca148 am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
automerge: db864e4

* commit 'db864e4ddc788a21db6793bbcb5f559131f20736':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-05 13:58:33 +00:00
Tom Taylor
865a658246 am 4e985118: am 6209d4e4: am 7c570346: am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushMana 
* commit '4e9851183daf26d602d641917378d55a9516f128':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-05 04:26:13 +00:00
Tom Taylor
dd41b62924 am f2f59e7a: am db864e4d: am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit 'f2f59e7ab916e37d510db151904c95c42006ae08':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-05 04:26:09 +00:00
Tom Taylor
4e9851183d am 6209d4e4: am 7c570346: am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit '6209d4e4d8a8662628c53cd5e1944abf30293d87':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-05 04:21:07 +00:00
Tom Taylor
f2f59e7ab9 am db864e4d: am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit 'db864e4ddc788a21db6793bbcb5f559131f20736':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-05 04:20:11 +00:00
Eric Gilmore
1c9860f928 am 4f82acd8: am bf78adb2: Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images. 
* commit '4f82acd810601c4d055906cb2b671cafd15d3fc8':
  Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.
 2014-11-05 00:20:18 +00:00
Eric Gilmore
4f82acd810 am bf78adb2: Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images. 
* commit 'bf78adb25e80b9107fcd682d30e7157093681547':
  Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.
 2014-11-05 00:12:16 +00:00
Eric Gilmore
bf78adb25e Adding 5.0 emulator image and removing older image. 
2nd patch set includes low/high res. images.

Bug: 18026943

Change-Id: I102e5de616251e742c8e7b9cf1948be1cbbc4a1c
 2014-11-04 15:01:24 -08:00
Bryce Lee
55e846d4a2 Add config to control going to sleep when entering theater mode. 
Bug: 18241209
Change-Id: I7fa29d92391b1c8ab74585008d6599fd7174cc61
 2014-11-04 12:43:44 -08:00
Justin Koh
7c1ad0cac6 Hide Surface#lockHardwareCanvas DO NOT MERGE 
Hide this for now, will be public in a later release.

Change-Id: Ie13438ed10918df8b044103ef04016494aed1d10
 2014-11-04 11:26:14 -08:00
Tom Taylor
6209d4e4d8 am 7c570346: am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit '7c570346082f7f0399614b87f9a4c67d1ae1f1c6':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-04 19:18:50 +00:00
Tom Taylor
7c57034608 am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit '47419a443591ea3c641da8720514e1384dd75440':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-04 19:14:26 +00:00
Tom Taylor
47419a4435 am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit '192a39044290be84a1086a876a9d4ab0571ab97b':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-04 19:08:16 +00:00
Tom Taylor
192a390442 am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit '23fb29723c47b2aeb6aecc382a503630a8d8e983':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-04 19:00:42 +00:00
Tom Taylor
23fb29723c am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit 'd7044fe1f12b48cc7ba6803772ec4a2f2fe14c19':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-04 18:50:31 +00:00
Tom Taylor
d7044fe1f1 am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit 'b2e54c1b46c275d017fb5bef17add3eb4c465508':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-04 18:39:38 +00:00
Tom Taylor
b2e54c1b46 am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit '75e7fbaa83448753a1db9647e58693f1a281900c':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-04 18:30:23 +00:00
Tom Taylor
75e7fbaa83 am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit '37906e6ebc1985ad4b7151116b7cf4fef8322b19':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-04 18:23:51 +00:00
Tom Taylor
37906e6ebc am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit '44f6d0d5810ce507394cc514481d977315d2496f':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-04 18:18:16 +00:00
Scott Kennedy
4b28b1c3f5 am cf57296d: am d78ce503: Merge "Fix a small typo in a variable name" into lmp-docs 
* commit 'cf57296da6a22bff03eefda7b704787769ad4d37':
  Fix a small typo in a variable name
 2014-11-04 18:12:05 +00:00
Tom Taylor
44f6d0d581 am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit '4c5b16d7409bbd947af3e0dadf4b1901b48e4cd7':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-04 18:11:02 +00:00
Ricardo Cervera
c190e7ee01 am af002b35: am 61f91724: Merge "docs: Fix the circularReveal example." into lmp-docs 
* commit 'af002b352ade0d7f9eeff15221f487c3912ebb34':
  docs: Fix the circularReveal example.
 2014-11-04 18:07:11 +00:00
Scott Kennedy
cf57296da6 am d78ce503: Merge "Fix a small typo in a variable name" into lmp-docs 
* commit 'd78ce50372ec473b6a895d053f9ffc2956e933ef':
  Fix a small typo in a variable name
 2014-11-04 18:06:32 +00:00
Tom Taylor
4c5b16d740 am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit '66aa87ae0355a4e6c8ed56704fec4fb225ed18f6':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-04 18:03:07 +00:00
Scott Kennedy
d78ce50372 Merge "Fix a small typo in a variable name" into lmp-docs 2014-11-04 18:01:28 +00:00
Ricardo Cervera
af002b352a am 61f91724: Merge "docs: Fix the circularReveal example." into lmp-docs 
* commit '61f91724a9375732cd95333921388a3e5a64ac33':
  docs: Fix the circularReveal example.
 2014-11-04 18:00:56 +00:00
Ricardo Cervera
61f91724a9 Merge "docs: Fix the circularReveal example." into lmp-docs 2014-11-04 17:56:22 +00:00
Tom Taylor
66aa87ae03 am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit '90743d6409eaecdc869fdcf891ffff8b0a5757ec':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-04 17:53:14 +00:00
Tom Taylor
db864e4ddc am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit '5244937248b7283b5cf586b5637a108579217d4e':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-04 17:49:26 +00:00