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

179299 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
b95475404e resolved conflicts for merge of 20db8770 to master 
Change-Id: Ifffcf8e2741ec242d940c3ba81244d4df57642fc
 2015-01-06 16:41:58 -08:00
Ricardo Cervera
7de2e066ae Merge "resolved conflicts for merge of 6302a72a to master" 2015-01-07 00:36:21 +00:00
Alan Viverette
714e236c18 Merge "Add getDither, getFilterBitmap to Drawable for CTS testing" 2015-01-07 00:36:09 +00:00
Ricardo Cervera
c5a1c1363c resolved conflicts for merge of 6302a72a to master 
Change-Id: I3adbbb983a2d7b0b85d3de0b14cbb2619aa711dd
 2015-01-06 16:31:37 -08:00
Baligh Uddin
70f52f6a1d am efc0bbec: (-s ours) am 94c4b4b2: (-s ours) am 15552158: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
automerge: 5e1b4a0  -s ours

* commit '5e1b4a0c8301716bd20fa172db523013e7b698bd':
  Import translations. DO NOT MERGE
 2015-01-06 22:50:17 +00:00
Sarah Maddox
1b8a5fb594 am efd72a48: am f22bca34: am 7d9309b6: am 029acc8e: am ab515931: Merge "docs: Fixes typo on Play services page for Maps." into lmp-docs 
automerge: 7aa9d75

* commit '7aa9d752c8cb5cfb9eeeeec23f53d1ad8ea271c2':
  docs: Fixes typo on Play services page for Maps.
 2015-01-06 22:47:29 +00:00
Joe Fernandez
f4e13642c3 am 952ebe3f: am 64d74fbf: am 69434df3: am 180bd6be: am 76db15a8: docs: fix problem with TOC after Japanese pages merge 
automerge: 88f10a8f

* commit '88f10a8f8ef616676dbf7f0ef68df32a8b75eea8':
  docs: fix problem with TOC after Japanese pages merge
 2015-01-06 22:45:54 +00:00
David Friedman
a4a325350c am 859e176b: am aed8152d: am 2d179c89: am 919ecb22: am 58a5e3db: Merge "Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e" into lmp-docs 
automerge: b64dea3

* commit 'b64dea3607ee12b3fd0e164b5c5fc90791bcdccd':
  Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e
 2015-01-06 22:44:32 +00:00
Joe Fernandez
cf973b13a9 am 9ebb780c: am 750c0385: am 214e6867: am c27d5fd6: am 7cec35ef: Merge "docs: b/18122848 [DAC] Android TV - Recommendation card" into lmp-docs 
automerge: 698f155

* commit '698f1557ff32c38b76891787050c64c2e01fd794':
  docs: b/18122848 [DAC] Android TV - Recommendation card
 2015-01-06 22:41:51 +00:00
Joe Fernandez
d03afd4e57 am 633db0ee: am c4429f1f: am 001f6f54: am 66fefd0c: am a9a36ab2: Merge "docs: plugin link name update" into lmp-docs 
automerge: 60906b5

* commit '60906b55ba63f24f94c2df0f6c856aad977d3213':
  docs: plugin link name update
 2015-01-06 22:39:58 +00:00
Scott Rowe
5d1a4cf68b am dfc950b4: am aa7c1f68: am 13d31b0a: am d7d1411a: am e2b44f86: docs: Making TV Apps Searchable - new training 
automerge: d35c1d3

* commit 'd35c1d3f47102a836d97121cb5c7f921f5022edf':
  docs: Making TV Apps Searchable - new training
 2015-01-06 22:38:43 +00:00
Deepanshu Gupta
20db87702b am e15f580b: am 2bd01ebf: am 7ed14549: am 7081a114: Merge "Add preferences rendering." into lmp-dev 
* commit 'e15f580b9d7a555bff96efd3cec195b39637e679':
  Add preferences rendering.
 2015-01-06 22:36:21 +00:00
Ricardo Cervera
6302a72a8d am 934c8ddc: am ebc28729: am e7d1db56: am d69238ef: am 4bb503cf: docs: Minor fixes in Android Studio pages. 
* commit '934c8ddc207133cc26eea9ce10d2079f2d6ff3ea':
  docs: Minor fixes in Android Studio pages.
 2015-01-06 22:36:16 +00:00
Baligh Uddin
5e1b4a0c83 am efc0bbec: (-s ours) am 94c4b4b2: (-s ours) am 15552158: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'efc0bbecc5dad6e1ac78b39b4f6f0c7f943d2b25':
  Import translations. DO NOT MERGE
 2015-01-06 22:36:10 +00:00
Sarah Maddox
7aa9d752c8 am efd72a48: am f22bca34: am 7d9309b6: am 029acc8e: am ab515931: Merge "docs: Fixes typo on Play services page for Maps." into lmp-docs 
* commit 'efd72a4845a976aac5f9a8a464a1ee6fdbcec28a':
  docs: Fixes typo on Play services page for Maps.
 2015-01-06 22:36:05 +00:00
Joe Fernandez
88f10a8f8e am 952ebe3f: am 64d74fbf: am 69434df3: am 180bd6be: am 76db15a8: docs: fix problem with TOC after Japanese pages merge 
* commit '952ebe3fac284d4602aba3e36db80c407f6bc476':
  docs: fix problem with TOC after Japanese pages merge
 2015-01-06 22:35:59 +00:00
David Friedman
b64dea3607 am 859e176b: am aed8152d: am 2d179c89: am 919ecb22: am 58a5e3db: Merge "Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e" into lmp-docs 
* commit '859e176bfeb36cfafc1d8ed0a8748aefa2cf1982':
  Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e
 2015-01-06 22:35:54 +00:00
Joe Fernandez
698f1557ff am 9ebb780c: am 750c0385: am 214e6867: am c27d5fd6: am 7cec35ef: Merge "docs: b/18122848 [DAC] Android TV - Recommendation card" into lmp-docs 
* commit '9ebb780ccb600b7528b88a4d7929243fb1205cca':
  docs: b/18122848 [DAC] Android TV - Recommendation card
 2015-01-06 22:35:47 +00:00
Joe Fernandez
60906b55ba am 633db0ee: am c4429f1f: am 001f6f54: am 66fefd0c: am a9a36ab2: Merge "docs: plugin link name update" into lmp-docs 
* commit '633db0ee6644d3bb1f59ea274bb05cfa305daa5c':
  docs: plugin link name update
 2015-01-06 22:35:41 +00:00
Scott Rowe
d35c1d3f47 am dfc950b4: am aa7c1f68: am 13d31b0a: am d7d1411a: am e2b44f86: docs: Making TV Apps Searchable - new training 
* commit 'dfc950b40d7d24c08dc56ffec5327f8da11960e7':
  docs: Making TV Apps Searchable - new training
 2015-01-06 22:35:34 +00:00
Deepanshu Gupta
e15f580b9d am 2bd01ebf: am 7ed14549: am 7081a114: Merge "Add preferences rendering." into lmp-dev 
* commit '2bd01ebfa99815d4fb6b4e77754146a22cf66d03':
  Add preferences rendering.
 2015-01-06 22:29:17 +00:00
Ricardo Cervera
934c8ddc20 am ebc28729: am e7d1db56: am d69238ef: am 4bb503cf: docs: Minor fixes in Android Studio pages. 
* commit 'ebc2872929177c4780c68a0371a44c25f89a4f1f':
  docs: Minor fixes in Android Studio pages.
 2015-01-06 22:29:12 +00:00
Baligh Uddin
efc0bbecc5 am 94c4b4b2: (-s ours) am 15552158: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '94c4b4b2a5c368a4894bbd8a42301f7ce443129b':
  Import translations. DO NOT MERGE
 2015-01-06 22:29:07 +00:00
Sarah Maddox
efd72a4845 am f22bca34: am 7d9309b6: am 029acc8e: am ab515931: Merge "docs: Fixes typo on Play services page for Maps." into lmp-docs 
* commit 'f22bca34a08c4e24981f169d20135835a189cbf4':
  docs: Fixes typo on Play services page for Maps.
 2015-01-06 22:28:54 +00:00
Joe Fernandez
952ebe3fac am 64d74fbf: am 69434df3: am 180bd6be: am 76db15a8: docs: fix problem with TOC after Japanese pages merge 
* commit '64d74fbf8739d6992ccb9b42c53705ad9fce9e91':
  docs: fix problem with TOC after Japanese pages merge
 2015-01-06 22:28:49 +00:00
David Friedman
859e176bfe am aed8152d: am 2d179c89: am 919ecb22: am 58a5e3db: Merge "Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e" into lmp-docs 
* commit 'aed8152d864b90363569c3a2de09de35048cfeb2':
  Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e
 2015-01-06 22:28:43 +00:00
Joe Fernandez
9ebb780ccb am 750c0385: am 214e6867: am c27d5fd6: am 7cec35ef: Merge "docs: b/18122848 [DAC] Android TV - Recommendation card" into lmp-docs 
* commit '750c0385601964ae0bf16b75fe94eb1da22ffa29':
  docs: b/18122848 [DAC] Android TV - Recommendation card
 2015-01-06 22:28:38 +00:00
Joe Fernandez
633db0ee66 am c4429f1f: am 001f6f54: am 66fefd0c: am a9a36ab2: Merge "docs: plugin link name update" into lmp-docs 
* commit 'c4429f1fac0a7be38adaed24eec87e3d3d1e077c':
  docs: plugin link name update
 2015-01-06 22:28:33 +00:00
Scott Rowe
dfc950b40d am aa7c1f68: am 13d31b0a: am d7d1411a: am e2b44f86: docs: Making TV Apps Searchable - new training 
* commit 'aa7c1f6845dcac1ade80196280ead40958bd1acd':
  docs: Making TV Apps Searchable - new training
 2015-01-06 22:28:25 +00:00
Deepanshu Gupta
2bd01ebfa9 am 7ed14549: am 7081a114: Merge "Add preferences rendering." into lmp-dev 
* commit '7ed145493d3f5bea32c567980f77cc42f613197e':
  Add preferences rendering.
 2015-01-06 22:22:36 +00:00
Ricardo Cervera
ebc2872929 am e7d1db56: am d69238ef: am 4bb503cf: docs: Minor fixes in Android Studio pages. 
* commit 'e7d1db56324e406a074bf0c44e778060b07d2322':
  docs: Minor fixes in Android Studio pages.
 2015-01-06 22:22:27 +00:00
Baligh Uddin
94c4b4b2a5 am 15552158: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '155521586c71b8fd2ed61e3cd860a3a75c55a4e9':
  Import translations. DO NOT MERGE
 2015-01-06 22:22:13 +00:00
Sarah Maddox
f22bca34a0 am 7d9309b6: am 029acc8e: am ab515931: Merge "docs: Fixes typo on Play services page for Maps." into lmp-docs 
* commit '7d9309b6e9e6974608b2d355c9eb1a66550801b2':
  docs: Fixes typo on Play services page for Maps.
 2015-01-06 22:22:08 +00:00
Joe Fernandez
64d74fbf87 am 69434df3: am 180bd6be: am 76db15a8: docs: fix problem with TOC after Japanese pages merge 
* commit '69434df395798a725072424782f79daaa23aae14':
  docs: fix problem with TOC after Japanese pages merge
 2015-01-06 22:21:58 +00:00
David Friedman
aed8152d86 am 2d179c89: am 919ecb22: am 58a5e3db: Merge "Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e" into lmp-docs 
* commit '2d179c899a59a2001a665ca6c3725832aced648c':
  Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e
 2015-01-06 22:21:54 +00:00
Joe Fernandez
750c038560 am 214e6867: am c27d5fd6: am 7cec35ef: Merge "docs: b/18122848 [DAC] Android TV - Recommendation card" into lmp-docs 
* commit '214e6867c5339468a960e8b8a20c535c99eb9e57':
  docs: b/18122848 [DAC] Android TV - Recommendation card
 2015-01-06 22:21:47 +00:00
Joe Fernandez
c4429f1fac am 001f6f54: am 66fefd0c: am a9a36ab2: Merge "docs: plugin link name update" into lmp-docs 
* commit '001f6f5451a71da328c3e05b4da1ad3bf24ad613':
  docs: plugin link name update
 2015-01-06 22:21:43 +00:00
Scott Rowe
aa7c1f6845 am 13d31b0a: am d7d1411a: am e2b44f86: docs: Making TV Apps Searchable - new training 
* commit '13d31b0a40dd58d61e8a6ad82c1de165792b95e4':
  docs: Making TV Apps Searchable - new training
 2015-01-06 22:21:38 +00:00
Paul Lawrence
2c4b1610ef Merge "Fix crash caused by toHex returning exception" 2015-01-06 22:06:53 +00:00
Paul Lawrence
7e5898d146 Fix crash caused by toHex returning exception 
toHex was changed to throw an exception in
I4986a8e806d9066129f696ab9f2e80655424e723, but its caller was not adjusted
accordingly, causing a crash whenever an unencrypted device was booted.

Bug: 18886749
Change-Id: If0505f617001cf5e0d99cf14c8b09e6a6a377167
 2015-01-06 13:11:23 -08:00
Christopher Tate
235312d64b am ad02e38b: am 0a511d33: am 1c6014e7: Merge "Remove the "backup_data_changed" event log" into lmp-mr1-dev 
* commit 'ad02e38b631ff4e7a9fa26c7ed5240052fb29960':
  Remove the "backup_data_changed" event log
 2015-01-06 20:09:41 +00:00
Dianne Hackborn
9d06e9f92c am 3d44382a: am 6f36bd3a: am 5fe8197f: Merge "Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit" into lmp-mr1-dev 
* commit '3d44382aca0528a163be0bc7619208ce4b1e5798':
  Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit
 2015-01-06 20:09:36 +00:00
Olawale Ogunwale
803aa17918 am 59820738: am d8aa4660: am da90a9c2: Merge "Do not allow the navigation bar to move if width == height" 
* commit '59820738fd75d1c1311d30280f82f51d251c8d66':
  Do not allow the navigation bar to move if width == height
 2015-01-06 20:09:30 +00:00
Paul Jensen
8ca07337a6 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2015-01-06 20:09:28 +00:00
Paul Jensen
3e50161a6e am 932bfab9: am 6c93739f: am 9ffb53cb: Clear process DNS NetID binding when expiring or releaseing legacy requests. 
* commit '932bfab9aaa58f116935eb0a1f22de49301724c4':
  Clear process DNS NetID binding when expiring or releaseing legacy requests.
 2015-01-06 20:09:18 +00:00
Narayan Kamath
a6f7099343 am 031acc4b: am 3787decd: am 5137415e: Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod." 
* commit '031acc4b3920336e58c56abb99322cbeb9be9e5c':
  Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod.
 2015-01-06 20:09:12 +00:00
Narayan Kamath
f70afa9b8f am 721d0994: am f60b2d40: am 024191b5: Merge "Fix comment. It should be \'or\' not \'of\'." 
* commit '721d0994dc6ed370e359a33a6798f87389a428c8':
  Fix comment.  It should be 'or' not 'of'.
 2015-01-06 20:09:06 +00:00
Jinsuk Kim
59891a9547 am 30a061ed: am e96f9dd1: am b0b4921b: Merge "CEC: Make deviceSelect work for MHL device" into lmp-mr1-dev 
* commit '30a061ed4ffb7360d55b610566ce47b57c058543':
  CEC: Make deviceSelect work for MHL device
 2015-01-06 20:09:01 +00:00
Jinsuk Kim
c985404481 am e96f9dd1: am b0b4921b: Merge "CEC: Make deviceSelect work for MHL device" into lmp-mr1-dev 
automerge: 30a061e

* commit '30a061ed4ffb7360d55b610566ce47b57c058543':
  CEC: Make deviceSelect work for MHL device
 2015-01-06 20:06:57 +00:00
Andrew Solovay
ffe26c219f am eeaf280d: am ff62a5ee: am 4c7390d3: am b663f2fc: am 713cd74e: docs: New "app compatibility with managed profiles" doc 
automerge: 7dd1f66

* commit '7dd1f66bb66ac9a6f6dbf2bcc2c4548b9d123491':
  docs: New "app compatibility with managed profiles" doc
 2015-01-06 20:04:03 +00:00