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

162173 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Christopher Tate
0a511d33b0 am 1c6014e7: Merge "Remove the "backup_data_changed" event log" into lmp-mr1-dev 
* commit '1c6014e77dfad1a7af229d642df7b7300beee721':
  Remove the "backup_data_changed" event log
 2015-01-06 18:16:43 +00:00
Christopher Tate
1c6014e77d Merge "Remove the "backup_data_changed" event log" into lmp-mr1-dev 2015-01-06 18:09:41 +00:00
Dianne Hackborn
6f36bd3a00 am 5fe8197f: Merge "Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit" into lmp-mr1-dev 
* commit '5fe8197fde93f659acbbbdd5dda9c7eac69c468f':
  Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit
 2015-01-06 18:07:26 +00:00
Dianne Hackborn
5fe8197fde Merge "Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit" into lmp-mr1-dev 2015-01-06 18:00:00 +00:00
Paul Jensen
6c93739f2f am 9ffb53cb: Clear process DNS NetID binding when expiring or releaseing legacy requests. 
* commit '9ffb53cb1131eeac5c246e7378455bb4b64293f5':
  Clear process DNS NetID binding when expiring or releaseing legacy requests.
 2015-01-06 14:49:09 +00:00
Paul Jensen
9ffb53cb11 Clear process DNS NetID binding when expiring or releaseing legacy requests. 
When requests made by ConnectivityManager.startUsingNetworkFeature() are
expired or are canceled via ConnectivityManager.stopUsingNetworkFeature(),
we must remember to clear the binding of DNS requests from the calling
process to the Network satisfying the request.

bug:18778725
Change-Id: I800c808ac6486000241b5d263aa79a1192a9fe9e
 2015-01-06 09:43:04 -05:00
Jinsuk Kim
e96f9dd1a4 am b0b4921b: Merge "CEC: Make deviceSelect work for MHL device" into lmp-mr1-dev 
* commit 'b0b4921bcbb0619587509b882d33da52ebb98106':
  CEC: Make deviceSelect work for MHL device
 2015-01-06 04:06:35 +00:00
Jinsuk Kim
b0b4921bcb Merge "CEC: Make deviceSelect work for MHL device" into lmp-mr1-dev 2015-01-06 04:03:21 +00:00
Jinsuk Kim
6ad7cbde22 CEC: Make deviceSelect work for MHL device 
MHL device works on hotplug but not when API deviceSelect is invoked
to select it due to a bug not finding the right MHL device instance.
This CL rectifies it by searching for not only CEC but MHL devices
attached to TV.

Bug: 18909552
Change-Id: I4df1ead836090eb3a7476b7738be47a6970edb7d
 2015-01-06 11:52:14 +09:00
Andrew Solovay
eeaf280dc7 am ff62a5ee: am 4c7390d3: am b663f2fc: am 713cd74e: docs: New "app compatibility with managed profiles" doc 
* commit 'ff62a5eea743581dd0747026f09f3d73cdd4c1ea':
  docs: New "app compatibility with managed profiles" doc
 2015-01-06 02:12:48 +00:00
Joe Fernandez
c632031af3 am 27195338: am 546a0e8c: am 60925265: am afc3b9e7: Merge "docs: studio build output dir name update" into lmp-docs 
* commit '27195338192b63b62f274f11bcae57dc2788514f':
  docs: studio build output dir name update
 2015-01-06 02:12:43 +00:00
Joe Fernandez
06cdc2fd64 am 851931f0: am 21b92f34: am 43f4e8fa: am 27cb0a56: Merge "docs: gradle version update in plugin file" into lmp-docs 
* commit '851931f0626c0f450add010f2f8e836769a3afc9':
  docs: gradle version update in plugin file
 2015-01-06 02:12:38 +00:00
Joe Fernandez
4dc7c15860 am 3dcc1289: am 447ea509: am f110d357: am 8eaf4042: Merge "docs: gradle wrapper security note" into lmp-docs 
* commit '3dcc12892fba022f8c45e9575b23f20bbe55f6b4':
  docs: gradle wrapper security note
 2015-01-06 02:12:32 +00:00
Joe Fernandez
24a3ff4770 am 765ae116: am eed87a57: am 09b41c02: am e6395cd3: Merge "docs: project file and toc updates" into lmp-docs 
* commit '765ae116e2ebab02668c9ef5a7ae11f8a4ffa102':
  docs: project file and toc updates
 2015-01-06 02:12:27 +00:00
Joe Fernandez
e7558b44f7 am 596868b6: am c811b88a: am d3d09d87: am 66e851fa: Merge "docs: studio workflow links" into lmp-docs 
* commit '596868b6489e77f9165e0d03a8d451fccd7f3959':
  docs: studio workflow links
 2015-01-06 02:12:21 +00:00
Joe Fernandez
d1489d5db0 am a78664e0: am 411c779b: am c919f7cf: am 1092bafa: Merge "docs: studio tips and ticks grammmar typo" into lmp-docs 
* commit 'a78664e03078d7c671077192357c5e25c0556755':
  docs: studio tips and ticks grammmar typo
 2015-01-06 02:12:16 +00:00
Ricardo Cervera
4d4b599d7c am ac4444a2: am c5fae959: am 48a066db: am 60cfb01a: Merge "docs: Update wearable lists docs" into lmp-docs 
* commit 'ac4444a26f19bda442da367ba9bda194f09a68c5':
  docs: Update wearable lists docs
 2015-01-06 02:12:12 +00:00
Joe Fernandez
bea6f1e645 am b1062ad6: am c3fb32ab: am 4603c122: am 18a75595: Merge "docs: studio device emulator updates" into lmp-docs 
* commit 'b1062ad68efd04cdf236f8fec184e849da7548cf':
  docs: studio device emulator updates
 2015-01-06 02:12:06 +00:00
Sarah Maddox
73c943fc71 am 15e94fdf: am 4811f9b8: am ecf0ac29: am ca23a587: Merge "docs: Updates the request-location-updates lesson in the location APIs training course." into lmp-docs 
* commit '15e94fdf343e688113a47342048ebd2baf646338':
  docs: Updates the request-location-updates lesson in the location APIs training course.
 2015-01-06 02:12:01 +00:00
Ricardo Cervera
fd731d4beb am fcba6472: am 9719336b: am 4ef7873d: am 8e631d2d: Merge "docs: Adding vector drawables video" into lmp-docs 
* commit 'fcba64722bb10fae8c17a994d343080aa439fc8c':
  docs: Adding vector drawables video
 2015-01-06 02:11:56 +00:00