Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,551 Commits 3 Branches 0 Tags
8652bce13765fb29329df2a4ccca4591bae28de5
Commit Graph

176551 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Kenny Root
c71f264847 Merge "frameworks/base: switch to using NativeConstants." 2015-04-24 21:26:14 +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
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
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
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
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
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
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
Leon Scroggins III
38cf068c04 am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit '16ac8ad7fac73524b5296f955884bd2aec405ded':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-24 17:15:43 +00:00
Adam Langley
6bf52c4271 frameworks/base: switch to using NativeConstants. 
NativeCrypto is a conscrypt class that contained several OpenSSL
constants. NativeConstants is the new class that contains the same
thing, but the latter is automatically generated and thus won't drift
from the C headers.

Bug: 20521989

Change-Id: I45c7b9a6844a06e3ffd09be692ebf733e1ebbbcc
 2015-04-24 10:00:45 -07:00
Mark Renouf
55555a3dab Fixes rejected dismiss gestures (framework version of ag/677161) 
Gus's original change description:

This change modifies the logic in SwipeDismissLayout which determines
whether or not a gesture should be interpreted as a dismiss
gesture.

Previously, on the first touch move event, the gesture was classified
as a dismiss gesture if the X movement exceeded the touch slop
and the Y movement did not.  At this point the gesture was not
intercepted and the underlying widget (in the case of the cue
card, the GridViewPager) received all subsequent move events.

In the case of a very fast gesture at a slight vertical angle, it was
easy for the total Y movement to exceed the touch slop.
This change only rejects the gesture if the Y movement exceeds
the X movement, which is consistent with how GridViewPager
distinguishes horizontal vs. vertical swipes.
This change also cancels the dismissal if the end of the gesture
is a leftwards flight.

BUG: 20542762

(Same as b/20350515 but for Activity dismissal at the system level.)

Change-Id: I6e3fb646c42dda0d1c1f5552d91b27c6374fc08c
 2015-04-24 11:47:27 -04:00
Neil Fuller
ff1e7e01f1 am 0e29681f: Merge "Load ICU4J data on boot" 
* commit '0e29681f98dad8df9f772d86a848190138245f3d':
  Load ICU4J data on boot
 2015-04-24 10:50:52 +00:00
Neil Fuller
0e29681f98 Merge "Load ICU4J data on boot" 2015-04-24 10:30:18 +00:00
Andrew Solovay
090df87d7e am 4dde4c9e: am e45e41d7: am 44fa5e71: am 5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs 
* commit '4dde4c9e723826fae1275c6537d2d5a615b3a0ae':
  Docs: Correcting section on how to escape quotes in strings.
 2015-04-23 20:53:23 +00:00
Andrew Solovay
4dde4c9e72 am e45e41d7: am 44fa5e71: am 5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs 
* commit 'e45e41d7fa6c88cf74be31a509003b8f9e7fa7b1':
  Docs: Correcting section on how to escape quotes in strings.
 2015-04-23 20:41:14 +00:00
Andrew Solovay
e45e41d7fa am 44fa5e71: am 5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs 
* commit '44fa5e71ab709c83af387958598f551583d6dbb0':
  Docs: Correcting section on how to escape quotes in strings.
 2015-04-23 20:29:42 +00:00
Andrew Solovay
44fa5e71ab am 5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs 
* commit '5b3152cffcd90441ca4cacdf5596e9bb3428af08':
  Docs: Correcting section on how to escape quotes in strings.
 2015-04-23 20:18:51 +00:00
Andrew Solovay
5b3152cffc Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs 2015-04-23 20:06:34 +00:00
Andrew Solovay
8aff67ec36 am dad05551: am 24ccb900: am 7a866a88: am 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs 
* commit 'dad055518f3416d2c212230343cb8f9433e395a2':
  docs: Update to doc on listening for restrictions-changed intent
 2015-04-23 19:09:28 +00:00
Andrew Solovay
dad055518f am 24ccb900: am 7a866a88: am 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs 
* commit '24ccb900258443bff7d943ad0d4fe1ff1f6f0ba4':
  docs: Update to doc on listening for restrictions-changed intent
 2015-04-23 18:56:26 +00:00
Andrew Solovay
24ccb90025 am 7a866a88: am 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs 
* commit '7a866a88318f6a44f316dc18e0472f39a289fee6':
  docs: Update to doc on listening for restrictions-changed intent
 2015-04-23 18:44:24 +00:00
Andrew Solovay
7a866a8831 am 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs 
* commit '09cf4d500dd27342c913d2333f4f0fd2fa9dbfd0':
  docs: Update to doc on listening for restrictions-changed intent
 2015-04-23 18:31:59 +00:00
Andrew Solovay
09cf4d500d Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs 2015-04-23 18:20:07 +00:00
Leon Scroggins III
67326bcba0 am ea2dcda7: am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit 'ea2dcda788e035ccdc55ab16303c9e34740a3f8c':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-23 16:41:49 +00:00
Leon Scroggins III
ea2dcda788 am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit 'ee35410ff8297b1ab39f3e546ebcedc27300a7de':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-23 16:29:22 +00:00
Leon Scroggins III
ee35410ff8 am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit 'a7501119e341626536ce12c3539c2f9a986a2945':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-23 16:20:02 +00:00
Leon Scroggins III
16ac8ad7fa am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit '4a6ca6724c789603626d74a8cc187365788a6cfd':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-23 15:53:24 +00:00
Leon Scroggins III
a7501119e3 am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit '69b8e962e1b8346b33a2c14889547a0ac00c8b17':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-23 15:48:12 +00:00
Svet Ganov
f33489c6bd am d24cc193: am db672b6c: am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev 
* commit 'd24cc19343073294b3376f825bdc0d54a8d692f1':
  DO NOT MERGE Don't take flags when creating app widget config activity.
 2015-04-23 15:43:01 +00:00
Svet Ganov
d24cc19343 am db672b6c: am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev 
* commit 'db672b6cde256e27c1188c7e99f23e5a65252ba4':
  DO NOT MERGE Don't take flags when creating app widget config activity.
 2015-04-23 15:30:43 +00:00
Svet Ganov
db672b6cde am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev 
* commit '00e91901fd1dd007de196ada04e3fc2f79e1be73':
  DO NOT MERGE Don't take flags when creating app widget config activity.
 2015-04-23 15:18:10 +00:00
Svet Ganov
00e91901fd Merge "DO NOT MERGE Don't take flags when creating app widget config activity." into lmp-mr1-dev 2015-04-23 15:09:48 +00:00
Neil Fuller
9f7cd10134 Load ICU4J data on boot 
Bug: 20252074
Bug: 20396452
Change-Id: I17de761e0d81caa2fc280b5cc368ee6113a5d655
 2015-04-23 14:50:34 +01:00
Quddus Chong
e470fd855c am d80f4fc8: am 04002800: am d57ccb8d: am f0936e2f: Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs 
* commit 'd80f4fc80a132b40ace7ba2b51eb784d73443004':
  docs: Added 3rd-party Javadocs for GMS Parmesan release.
 2015-04-23 04:43:41 +00:00
Quddus Chong
d6588e3575 am 918b71ca: am a5cca430: am 7a8b0945: am 789c5971: Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs 
* commit '918b71ca319373c0025c2ddf0168877c7bc8d306':
  docs: Added What's New section for GMS v7.3 (Parmesan).
 2015-04-23 04:43:35 +00:00