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

159368 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vladimir Marko
152d7282a4 Check for OOM in BitmapFactory's getMimeTypeString(). 
Bug: 18909596

(cherry picked from commit 7ab249a18e08bfefb8c2d60af1fb668c67ba4368)

Change-Id: Ie7be228442876d47faf37e3f664e378253dab6e3
 2015-01-07 11:50:04 +00:00
Deepanshu Gupta
984823f543 am 7f9582ce: am 48603a39: Fix tests on jenkins 
* commit '7f9582ce616a81b70794d7942b39f8442f5ef9d5':
  Fix tests on jenkins
 2015-01-07 09:23:17 +00:00
Quddus Chong
bc8b0541d7 am 96f11258: am dc649c8d: am 8a195822: Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727" into lmp-docs 
* commit '96f11258ab19962c93b615c00b387bdc05c0d75b':
  docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727
 2015-01-07 09:23:10 +00:00
Quddus Chong
7628b72826 am decac431: am 14694d6e: am 3bdc68ed: Merge "docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181" into lmp-docs 
* commit 'decac4319172c5f1c618de93dcb2a15678c3e214':
  docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181
 2015-01-07 09:23:07 +00:00
Quddus Chong
fbb2796079 am 4d39cfa4: am a63d2b83: am b55e2bf0: Merge "docs: Updated the description of the enhanced camera APIs in L. bug: 18142680" into lmp-docs 
* commit '4d39cfa415f1c391a94b001319b8d1c7b02b61c2':
  docs: Updated the description of the enhanced camera APIs in L. bug: 18142680
 2015-01-07 09:23:02 +00:00
Joe Fernandez
52aec00cb4 am ca14e6c8: am f50be1fc: am 91c35ce1: Merge "docs: studio index typo" into lmp-docs 
* commit 'ca14e6c8326136686d3de796f1fcd7eb2b5aebe3':
  docs: studio index typo
 2015-01-07 09:22:58 +00:00
Joe Fernandez
76094382cf am c6fe54ed: am 62c3abe7: am acb35e19: Merge "docs: studio bundle checksum update" into lmp-docs 
* commit 'c6fe54ed869d270533f6a3cf6ddea1e10d83afcc':
  docs: studio bundle checksum update
 2015-01-07 09:22:53 +00:00
Joe Fernandez
4c5b5cffa7 Merge "resolved conflicts for merge of ea0137ef to lmp-mr1-dev" into lmp-mr1-dev 2015-01-07 09:14:17 +00:00
Sungsoo Lim
71d8b8ce99 Merge "DO NOT MERGE Implement cloneTvInputEvent" into lmp-mr1-dev 2015-01-07 07:58:18 +00:00
Wonsik Kim
cee5c8edee Merge "DO NOT MERGE TIF: change TvInputHal events to run on its own thread" into lmp-mr1-dev 2015-01-07 07:30:53 +00:00
Scott Rowe
188a8774c9 resolved conflicts for merge of ea0137ef to lmp-mr1-dev 
Change-Id: If0a38ebe4e72ec6c1a3683fab1302ee0fdfe4214
 2015-01-06 19:30:11 -08:00
Deepanshu Gupta
7f9582ce61 am 48603a39: Fix tests on jenkins 
* commit '48603a39d4dd721d231c99e10908f4f00c4ec6b9':
  Fix tests on jenkins
 2015-01-07 01:43:39 +00:00
Deepanshu Gupta
48603a39d4 Fix tests on jenkins 
When the tests are run on the build server, they are run from the jar,
as opposed to the extracted build, which is default when run from an
IDE. Thus, when class.getResourceAsStream() is called with ".." in the
path, it is not resolved properly. This change explicitly resolves the
relative path, so that the test is run properly on the server.

Change-Id: Ib5fabd617dca4052220e5173a8bf4fb4234254ff
 2015-01-06 17:32:26 -08:00
Paul Miller
a517e81e2b Merge "Fix crash on pasting text in a WebView" into lmp-mr1-dev 2015-01-07 01:08:35 +00:00
Shishir Agrawal
5a21b0c2d0 Merge "GpsLocationProvider: Read data enabled status from TelephonyManager." into lmp-mr1-dev 2015-01-07 00:12:17 +00:00
Yin-Chia Yeh
8d46f934ca Merge "Camera: doc update for color aberration modes" into lmp-mr1-dev 2015-01-06 23:59:03 +00:00
Ye Wen
55fb7576c3 Merge "Add new mms error for no data network (airplane mode or no mobile data)" into lmp-mr1-dev 2015-01-06 23:49:23 +00: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
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
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
Ye Wen
bd2d53413c Add new mms error for no data network (airplane mode or no mobile data) 
b/18872094

Change-Id: Ia2e939fe91b6f80c192d601c80de551f173e5e6f
 2015-01-06 14:07:55 -08:00
Paul Miller
f6bf1d7b30 Fix crash on pasting text in a WebView 
WindowDecorActionBar and Chrome's ContentViewCore each have their own ActionMode
reference. ActionModeImpl.finish() nulls WindowDecorActionBar's reference and
calls mCallback.onDestroyActionMode() to null ContentViewCore's reference. But
if the callback is deferred, there is a period when the ActionMode is finished
(and mCallback is null), but ContentViewCore doesn't know. ContentViewCore may
try to invalidate() the ActionMode, which will crash on the null mCallback.

Make ActionModeImpl more permissive so that calling invalidate() during this
period does nothing.

BUG:18758329
Change-Id: I407fa0e0cd3cffa217e165caed83130d44760316
 2015-01-06 11:32:02 -08:00
Yin-Chia Yeh
941aac0c07 Camera: doc update for color aberration modes 
Code-gened document update for camera2 spec.

Bug: 18915494
Change-Id: I4b6236415f93739da4562eac81f53d2fd4c10f69
 2015-01-06 18:46:15 +00:00
Quddus Chong
96f11258ab am dc649c8d: am 8a195822: Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727" into lmp-docs 
* commit 'dc649c8da46dc1cc2ac7df41ddde0f28c64db687':
  docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727
 2015-01-06 18:23:08 +00:00
Quddus Chong
decac43191 am 14694d6e: am 3bdc68ed: Merge "docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181" into lmp-docs 
* commit '14694d6e6d8852bbf0591787e0f84627921996c9':
  docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181
 2015-01-06 18:23:04 +00:00
Quddus Chong
4d39cfa415 am a63d2b83: am b55e2bf0: Merge "docs: Updated the description of the enhanced camera APIs in L. bug: 18142680" into lmp-docs 
* commit 'a63d2b838396be0d9da7c8d8263f207beaf8d6f7':
  docs: Updated the description of the enhanced camera APIs in L. bug: 18142680
 2015-01-06 18:23:00 +00:00
Quddus Chong
dc649c8da4 am 8a195822: Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727" into lmp-docs 
* commit '8a195822e264754f08f43322348ebce273f72c40':
  docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727
 2015-01-06 18:15:54 +00:00
Quddus Chong
14694d6e6d am 3bdc68ed: Merge "docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181" into lmp-docs 
* commit '3bdc68edcf98a1ccdfea9539fe5e3a4d4416f8a8':
  docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181
 2015-01-06 18:15:51 +00:00
Quddus Chong
a63d2b8383 am b55e2bf0: Merge "docs: Updated the description of the enhanced camera APIs in L. bug: 18142680" into lmp-docs 
* commit 'b55e2bf0e0ab3150f99a6c50af56e99cc660e094':
  docs: Updated the description of the enhanced camera APIs in L. bug: 18142680
 2015-01-06 18:15:47 +00:00
Quddus Chong
8a195822e2 Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727" into lmp-docs 2015-01-06 18:10:38 +00:00
Quddus Chong
3bdc68edcf Merge "docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181" into lmp-docs 2015-01-06 18:10:17 +00:00
Quddus Chong
b55e2bf0e0 Merge "docs: Updated the description of the enhanced camera APIs in L. bug: 18142680" into lmp-docs 2015-01-06 18:09:45 +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
Joe Fernandez
ca14e6c832 am f50be1fc: am 91c35ce1: Merge "docs: studio index typo" into lmp-docs 
* commit 'f50be1fcce8df7c8ddb3553d3bc36007a0745af7':
  docs: studio index typo
 2015-01-06 18:03:58 +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
Joe Fernandez
c6fe54ed86 am 62c3abe7: am acb35e19: Merge "docs: studio bundle checksum update" into lmp-docs 
* commit '62c3abe73086301e7125d6dc88954e16e436bd9d':
  docs: studio bundle checksum update
 2015-01-06 17:57:35 +00:00