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

176868 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Kralevich
05ad674aa8 am 00e165ae: am e8101c04: Merge "fix compiler error under FORTIFY_SOURCE=2" 
* commit '00e165aed3d53b147b153003b3b9fd3c129ff3c4':
  fix compiler error under FORTIFY_SOURCE=2
 2015-04-25 21:56:56 +00:00
Nick Kralevich
00e165aed3 am e8101c04: Merge "fix compiler error under FORTIFY_SOURCE=2" 
* commit 'e8101c047cffc69245493d96f2f2ec36728682f1':
  fix compiler error under FORTIFY_SOURCE=2
 2015-04-25 21:41:52 +00:00
Nick Kralevich
e8101c047c Merge "fix compiler error under FORTIFY_SOURCE=2" 2015-04-25 21:22:32 +00:00
Nick Kralevich
9709a1f04c fix compiler error under FORTIFY_SOURCE=2 
frameworks/base/libs/androidfw/ObbFile.cpp:340:5: error: ignoring return value of function declared with warn_unused_result attribute [-Werror,-Wunused-result]
    ftruncate(fd, mFooterStart);
    ^~~~~~~~~ ~~~~~~~~~~~~~~~~
1 error generated.
amake: *** [out/host/linux-x86/obj/STATIC_LIBRARIES/libandroidfw_intermediates/ObbFile.o] Error 1

Change-Id: I7080d64e7a830a10b41c1ebf33c60d32b7c8356e
 2015-04-24 20:27:06 -07:00
Quddus Chong
6c52d51c65 am bbe5effb: docs: Fixed typo in \'Authorizing with Google for REST APIs\' doc. bug: 18025533 
* commit 'bbe5effb6682b4ba5e6accd9a226ec7611fe83dc':
  docs: Fixed typo in 'Authorizing with Google for REST APIs' doc. bug: 18025533
 2015-04-24 23:43:49 +00:00
Quddus Chong
bbe5effb66 docs: Fixed typo in 'Authorizing with Google for REST APIs' doc. 
bug: 18025533

Change-Id: I6379b2a7be495a506e0e428fe9c68fdbe197704b
 2015-04-24 16:29:28 -07:00
Wale Ogunwale
cc9c597dad am d639a453: am e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread access the same provider"" 
* commit 'd639a4532417bf605f03b3b5efdb3a9e1cbe6661':
  Revert "[ActivityManager] Improve multi-thread access the same provider"
 2015-04-24 22:26:08 +00:00
Wale Ogunwale
4cdc7e842d am e2047da6: am d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider"" 
* commit 'e2047da6f3f21fc702d35b7d1c4e9bb62c963dac':
  Revert "Clean-up state if we have an exception when acquiring provider"
 2015-04-24 22:26:04 +00:00
Wale Ogunwale
d639a45324 am e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread access the same provider"" 
* commit 'e60077e62a441dbcc132b2abb35d998ab48d261c':
  Revert "[ActivityManager] Improve multi-thread access the same provider"
 2015-04-24 22:15:02 +00:00
Wale Ogunwale
e2047da6f3 am d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider"" 
* commit 'd9bf26522b930a8d5d25f6e28c390e39fee6d0b2':
  Revert "Clean-up state if we have an exception when acquiring provider"
 2015-04-24 22:14:56 +00:00
Kenny Root
6c1af7ea49 am 8652bce1: am c71f2648: Merge "frameworks/base: switch to using NativeConstants." 
* commit '8652bce13765fb29329df2a4ccca4591bae28de5':
  frameworks/base: switch to using NativeConstants.
 2015-04-24 22:00:56 +00:00
Wale Ogunwale
e60077e62a Merge "Revert "[ActivityManager] Improve multi-thread access the same provider"" 2015-04-24 21:49:47 +00:00
Kenny Root
8652bce137 am c71f2648: Merge "frameworks/base: switch to using NativeConstants." 
* commit 'c71f264847eb75d53c0f99e6e1c42a8a1527d3b4':
  frameworks/base: switch to using NativeConstants.
 2015-04-24 21:49:47 +00:00
Wale Ogunwale
d9bf26522b Merge "Revert "Clean-up state if we have an exception when acquiring provider"" 2015-04-24 21:49:41 +00:00
Wale Ogunwale
1d646128b2 Revert "[ActivityManager] Improve multi-thread access the same provider" 
This reverts commit 57307b21cbdb261eeca081051ed61540dcf905f8.

Bug: 20091132
 2015-04-24 14:45:14 -07:00
Wale Ogunwale
67fe0a450c Revert "Clean-up state if we have an exception when acquiring provider" 
This reverts commit 73e239bdc9493d81215d5afe739b3ed095686ba2.

Bug: 20091132
 2015-04-24 14:44:54 -07:00
Kenny Root
c71f264847 Merge "frameworks/base: switch to using NativeConstants." 2015-04-24 21:26:14 +00:00
Alex Klyubin
f9c14b7d16 am b068ae14: am e2b9bb45: Merge "No runtime exceptions during normal use of AndroidKeyStore crypto." 
* commit 'b068ae143df2c2f3030da23d7fc130f735975867':
  No runtime exceptions during normal use of AndroidKeyStore crypto.
 2015-04-24 20:35:26 +00:00
Alex Klyubin
b068ae143d am e2b9bb45: Merge "No runtime exceptions during normal use of AndroidKeyStore crypto." 
* commit 'e2b9bb45d20102f121660ed361bd4225852a55e0':
  No runtime exceptions during normal use of AndroidKeyStore crypto.
 2015-04-24 20:22:58 +00:00
Alex Klyubin
e2b9bb45d2 Merge "No runtime exceptions during normal use of AndroidKeyStore crypto." 2015-04-24 20:00:58 +00:00
Quddus Chong
9408959144 am 9774e8ab: Merge "docs: Updated What\'s New for GMS v7.3 to remove Maps support for Wear." into lmp-mr1-ub-docs 
* commit '9774e8ab0890d694840c883f309916a444b3ee54':
  docs: Updated What's New for GMS v7.3 to remove Maps support for Wear.
 2015-04-24 19:56:39 +00:00
Quddus Chong
9774e8ab08 Merge "docs: Updated What's New for GMS v7.3 to remove Maps support for Wear." into lmp-mr1-ub-docs 2015-04-24 19:48:04 +00:00
Scott Rowe
eec5463cb9 am 5e95a917: am 17c0b254: am ccfedfcc: am 5827af11: am 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs 
* commit '5e95a91707ecd53c1ab0eb688513a2328271f9a2':
  docs: Supported media protocols, codecs, formats for Android TV
 2015-04-24 18:52:35 +00:00
Scott Rowe
5e95a91707 am 17c0b254: am ccfedfcc: am 5827af11: am 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs 
* commit '17c0b25441a264efe87ab2db82c04c0e018c178c':
  docs: Supported media protocols, codecs, formats for Android TV
 2015-04-24 18:43:03 +00:00
Scott Rowe
17c0b25441 am ccfedfcc: am 5827af11: am 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs 
* commit 'ccfedfccbe63af223027471ea80869d0fb011098':
  docs: Supported media protocols, codecs, formats for Android TV
 2015-04-24 18:30:07 +00:00
Alex Klyubin
edf5454a14 am 3167fb4b: am 71223ebe: Merge "Reset AndroidKeyStore Mac and Cipher state when init fails." 
* commit '3167fb4b6e190705d21a76b34cc376a89675a6a0':
  Reset AndroidKeyStore Mac and Cipher state when init fails.
 2015-04-24 18:21:22 +00:00
Olawale Ogunwale
3846d3a4c5 am 6d856bfb: am cf7d2d95: Merge "[ActivityManager] Avoid orphan ContentProviderRecord." 
* commit '6d856bfba5b6ae488d49c4909510cd87000cd922':
  [ActivityManager] Avoid orphan ContentProviderRecord.
 2015-04-24 18:21:19 +00:00
Leon Scroggins III
fddbcd857f am 8be18bbf: am 4c1f70db: am b3523d7f: am 41c458c8: am 67326bcb: am ea2dcda7: am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit '8be18bbfc23b768ae3022f988e586871754958ac':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-24 18:16:34 +00:00
Leon Scroggins III
38b84b6d76 am 60d7c9fc: am 6db29a92: am f828f43f: am 38cf068c: am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit '60d7c9fcbcb80c556689f03c7b00984f94f9912b':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-24 18:16:29 +00:00
Scott Rowe
ccfedfccbe am 5827af11: am 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs 
* commit '5827af11bdcd9973afe04cb035e83c6428d1e562':
  docs: Supported media protocols, codecs, formats for Android TV
 2015-04-24 18:16:26 +00:00
Alex Klyubin
3167fb4b6e am 71223ebe: Merge "Reset AndroidKeyStore Mac and Cipher state when init fails." 
* commit '71223ebe1b2264b7463a02c8dafd779eb3b8c210':
  Reset AndroidKeyStore Mac and Cipher state when init fails.
 2015-04-24 18:11:50 +00:00
Olawale Ogunwale
6d856bfba5 am cf7d2d95: Merge "[ActivityManager] Avoid orphan ContentProviderRecord." 
* commit 'cf7d2d95adb358a628c2622b43a999d3ab784406':
  [ActivityManager] Avoid orphan ContentProviderRecord.
 2015-04-24 18:11:29 +00:00
Scott Rowe
6a6bfe5e84 am 6e5063fe: docs: Supported media protocols, codecs, formats for Android TV 
* commit '6e5063fe88b265c89b39401545925b9e0cbd8390':
  docs: Supported media protocols, codecs, formats for Android TV
 2015-04-24 18:10:25 +00:00
Scott Rowe
5827af11bd am 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs 
* commit '02e4f2fbe6e0511789d42d5942548158d2dd154f':
  docs: Supported media protocols, codecs, formats for Android TV
 2015-04-24 18:01:15 +00:00
Scott Rowe
6e5063fe88 docs: Supported media protocols, codecs, formats for Android TV 
Change-Id: I8202ba148d35d73ee0940070090e0a29553f9202
(cherry picked from commit f769caa8c15f9983188597e2436b011d23ff2561)
 2015-04-24 17:58:13 +00:00
Leon Scroggins III
8be18bbfc2 am 4c1f70db: am b3523d7f: am 41c458c8: am 67326bcb: am ea2dcda7: am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit '4c1f70db3dc37f818bdff09ec3e289b797acc397':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-24 17:54:57 +00:00
Leon Scroggins III
60d7c9fcbc am 6db29a92: am f828f43f: am 38cf068c: am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit '6db29a92452c2a837528d20d024dcacefd450c17':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-24 17:54:50 +00:00
Alex Klyubin
ad9ba10ecd No runtime exceptions during normal use of AndroidKeyStore crypto. 
This changes the implementation of AndroidKeyStore-backed Cipher and
Mac to avoid throwing runtime exceptions during normal use. Runtime
exceptions will now be thrown only due to truly exceptional and
unrecoverable errors (e.g., keystore unreachable, or crypto primitive
not initialized).

This also changes the implementation of Cipher to cache any errors
encountered in Cipher.update until Cipher.doFinal which then throws
them as checked exceptions.

Bug: 20525947
Change-Id: I3c4ad57fe70abfbb817a79402f722a0208660727
 2015-04-24 10:54:45 -07:00
Alex Klyubin
71223ebe1b Merge "Reset AndroidKeyStore Mac and Cipher state when init fails." 2015-04-24 17:52:36 +00:00
Scott Rowe
02e4f2fbe6 Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs 2015-04-24 17:49:16 +00:00
Alex Klyubin
6c4a842129 Reset AndroidKeyStore Mac and Cipher state when init fails. 
For consistency, this also switches AndroidKeyStore's Mac init/reset
implementation to the same approach as used in Cipher.

Bug: 18088752
Change-Id: Id34caf7cfe04f2058e22d8632890f762927bb31c
 2015-04-24 10:49:11 -07:00
Leon Scroggins III
4c1f70db3d am b3523d7f: am 41c458c8: am 67326bcb: am ea2dcda7: am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit 'b3523d7f8f8274a04145ca34eab9821aafb52d7a':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-24 17:43:38 +00:00
Leon Scroggins III
6db29a9245 am f828f43f: am 38cf068c: am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit 'f828f43f97f4a018e2224e926b900713081a8c5b':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-24 17:43:23 +00:00
Olawale Ogunwale
cf7d2d95ad Merge "[ActivityManager] Avoid orphan ContentProviderRecord." 2015-04-24 17:43:01 +00:00
Mark Renouf
f237bce8c3 am 99d49300: am 55555a3d: Fixes rejected dismiss gestures (framework version of ag/677161) 
* commit '99d4930064e7d155ce92746028cbafd46b14c6f4':
  Fixes rejected dismiss gestures (framework version of ag/677161)
 2015-04-24 17:42:01 +00:00
Leon Scroggins III
b3523d7f8f am 41c458c8: am 67326bcb: am ea2dcda7: am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit '41c458c81125fb6e3fc9eb5304f0d3216a0a2d74':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-24 17:33:04 +00:00
Leon Scroggins III
f828f43f97 am 38cf068c: am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit '38cf068c04e1ce244529b95f6cc6d7d6a88fab24':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-24 17:32:59 +00:00
Mark Renouf
99d4930064 am 55555a3d: Fixes rejected dismiss gestures (framework version of ag/677161) 
* commit '55555a3dab1f3b99a3299b90851624e9dc10f3cc':
  Fixes rejected dismiss gestures (framework version of ag/677161)
 2015-04-24 17:31:31 +00:00
Quddus Chong
55931ca2de docs: Updated What's New for GMS v7.3 to remove Maps support for Wear. 
Change-Id: I8ebe6c77c4eac3ac660f148bf40ce9a1f710e5fb
 2015-04-24 10:26:19 -07:00
Leon Scroggins III
41c458c811 am 67326bcb: am ea2dcda7: am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit '67326bcba0f7287367dedba4caaf2a168a43f057':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-24 17:15:55 +00:00