Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,037 Commits 3 Branches 0 Tags
813d974e33366aaeeb54e242e2767d4eeaf940dc
Commit Graph

177037 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Lawrence
24063b5ebd 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 15:09:49 -08:00
Deepanshu Gupta
27ce276332 Merge "resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp again" into lmp-mr1-dev-plus-aosp 2015-01-06 23:00:39 +00:00
Deepanshu Gupta
e88c120ebf resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp again 
The earlier resolution (a2a5ce49b2)
wasn't the right one. This fixes it.

Change-Id: I6a6dc908d3e7dd510064a46df932d129a58eed98
 2015-01-06 14:58:37 -08:00
Ricardo Cervera
641353b6c2 am 85e0e70d: am 58872406: am a9a51433: am f211b625: am fa6fb0da: docs: Minor fixes to Watch Faces design guidelines. 
* commit '85e0e70dfa0deeda303a17da2d6d3981028af06f':
  docs: Minor fixes to Watch Faces design guidelines.
 2015-01-06 22:57:10 +00:00
Deepanshu Gupta
d5455fedaf am aebd7fdb: am 565f2245: am a6671b70: am 6461e054: Merge "Add image comparison to LayoutLib tests." into lmp-dev 
* commit 'aebd7fdb66b41b77a3cf51a7cf6911e8db3c7199':
  Add image comparison to LayoutLib tests.
 2015-01-06 22:50:18 +00:00
Ricardo Cervera
85e0e70dfa am 58872406: am a9a51433: am f211b625: am fa6fb0da: docs: Minor fixes to Watch Faces design guidelines. 
* commit '58872406a7f51f572fc272c12ab26024a358df07':
  docs: Minor fixes to Watch Faces design guidelines.
 2015-01-06 22:48:36 +00:00
Deepanshu Gupta
a2a5ce49b2 resolved conflicts for merge of 8c831b2f to lmp-mr1-dev-plus-aosp 
Change-Id: I8894287fd43afc863d070cab04cfaa1bf70f7ebb
 2015-01-06 14:46:27 -08:00
Ricardo Cervera
58872406a7 am a9a51433: am f211b625: am fa6fb0da: docs: Minor fixes to Watch Faces design guidelines. 
* commit 'a9a514331ce33dde91fbcc791fdc523b74a4ffb4':
  docs: Minor fixes to Watch Faces design guidelines.
 2015-01-06 22:41:03 +00:00
Deepanshu Gupta
5760f1535b am c2e9875d: am 229ce665: am 937db7a3: am 53f73a97: Merge "Add DatePicker, CalendarView to LayoutLib tests" into lmp-dev 
* commit 'c2e9875dcb173a4965b5c0e6022fc2e81f0a37ef':
  Add DatePicker, CalendarView to LayoutLib tests
 2015-01-06 22:36:45 +00:00
Deepanshu Gupta
67cf0bf421 am 84097e39: am b187106c: am e69e4f8b: am f9bb0b5e: Merge "Fix DatePicker rendering." into lmp-dev 
* commit '84097e3977c82554aafc2e461cd51d6f5eb03866':
  Fix DatePicker rendering.
 2015-01-06 22:36:39 +00:00
Deepanshu Gupta
adcd224135 am c7fe9793: am 48ab6bec: am 8c686ddd: am d20a518c: Merge "Make Preference-cookie map non static." into lmp-dev 
* commit 'c7fe979303eb924d7fbb9fa342cc5cd7b929c2d2':
  Make Preference-cookie map non static.
 2015-01-06 22:36:33 +00:00
Deepanshu Gupta
d050df7275 am addaeff9: am b88a65df: am cec8e5a1: am f861c0ce: Merge "Fix default initial value for preferences" into lmp-dev 
* commit 'addaeff9b28d833616376f802b7a38e32397edd1':
  Fix default initial value for preferences
 2015-01-06 22:36:27 +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
Shishir Agrawal
fabbdf7204 GpsLocationProvider: Read data enabled status from TelephonyManager. 
Bug: 18814559
Change-Id: I1488bd763d95d5ad087bc4ceb5f4c3767c05b62f
 2015-01-06 14:35:31 -08:00
Deepanshu Gupta
aebd7fdb66 am 565f2245: am a6671b70: am 6461e054: Merge "Add image comparison to LayoutLib tests." into lmp-dev 
* commit '565f2245402f4fe6038942b03b9a35cfc0d48d86':
  Add image comparison to LayoutLib tests.
 2015-01-06 22:29:52 +00:00
Deepanshu Gupta
8c831b2fc6 am 86f96d07: am 0db2524c: am b2ebb968: Merge "Remove Time from CreateInfo" into lmp-dev 
* commit '86f96d07c7d531d69bab3d402d33eb8f15038eee':
  Remove Time from CreateInfo
 2015-01-06 22:29:46 +00:00
Deepanshu Gupta
c2e9875dcb am 229ce665: am 937db7a3: am 53f73a97: Merge "Add DatePicker, CalendarView to LayoutLib tests" into lmp-dev 
* commit '229ce66583a51baabf83fec4d0c42af0d3ecba38':
  Add DatePicker, CalendarView to LayoutLib tests
 2015-01-06 22:29:39 +00:00
Deepanshu Gupta
84097e3977 am b187106c: am e69e4f8b: am f9bb0b5e: Merge "Fix DatePicker rendering." into lmp-dev 
* commit 'b187106c5397072b6ae26061cec847ec9343caee':
  Fix DatePicker rendering.
 2015-01-06 22:29:34 +00:00
Deepanshu Gupta
c7fe979303 am 48ab6bec: am 8c686ddd: am d20a518c: Merge "Make Preference-cookie map non static." into lmp-dev 
* commit '48ab6becea828c0bcaaf79fe930aac31881f59db':
  Make Preference-cookie map non static.
 2015-01-06 22:29:29 +00:00
Deepanshu Gupta
addaeff9b2 am b88a65df: am cec8e5a1: am f861c0ce: Merge "Fix default initial value for preferences" into lmp-dev 
* commit 'b88a65df73798becc57004b3fc55fdf8c0a83a13':
  Fix default initial value for preferences
 2015-01-06 22:29:24 +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
565f224540 am a6671b70: am 6461e054: Merge "Add image comparison to LayoutLib tests." into lmp-dev 
* commit 'a6671b707446963f402a71219725f317a57b42af':
  Add image comparison to LayoutLib tests.
 2015-01-06 22:23:01 +00:00
Deepanshu Gupta
86f96d07c7 am 0db2524c: am b2ebb968: Merge "Remove Time from CreateInfo" into lmp-dev 
* commit '0db2524caa01022629075a113d3370a1b7c3da30':
  Remove Time from CreateInfo
 2015-01-06 22:22:56 +00:00
Deepanshu Gupta
229ce66583 am 937db7a3: am 53f73a97: Merge "Add DatePicker, CalendarView to LayoutLib tests" into lmp-dev 
* commit '937db7a39ef6f5e88a936f78a729f9578123e60b':
  Add DatePicker, CalendarView to LayoutLib tests
 2015-01-06 22:22:53 +00:00
Deepanshu Gupta
b187106c53 am e69e4f8b: am f9bb0b5e: Merge "Fix DatePicker rendering." into lmp-dev 
* commit 'e69e4f8b4db142f024e170cf6faabb36095799b7':
  Fix DatePicker rendering.
 2015-01-06 22:22:49 +00:00
Deepanshu Gupta
48ab6becea am 8c686ddd: am d20a518c: Merge "Make Preference-cookie map non static." into lmp-dev 
* commit '8c686ddd540f3a15cdba4893f104c0e8e9af5716':
  Make Preference-cookie map non static.
 2015-01-06 22:22:44 +00:00
Deepanshu Gupta
b88a65df73 am cec8e5a1: am f861c0ce: Merge "Fix default initial value for preferences" into lmp-dev 
* commit 'cec8e5a10de413c733223b8b1cc11b70c6254647':
  Fix default initial value for preferences
 2015-01-06 22:22:40 +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