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

189584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Etan Cohen
5c0d6f61ab Merge commit '6ddbb5e' into merge2 2015-04-24 13:44:05 -07:00
Etan Cohen
21125b81c9 Merge commit 'de93575' into merge2 2015-04-24 13:43:50 -07:00
Etan Cohen
fa96c94c30 Merge commit '9561e74' into merge2 2015-04-24 13:43:36 -07:00
Andy Hung
5a4ee7b62e Merge "Fix API level in documentation to refer to MNC" 2015-04-24 19:22:22 +00:00
Andy Hung
35e576e792 Fix API level in documentation to refer to MNC 
Change-Id: I2ab646fce1c3f58b11d88a47e733621d8f1fec79
 2015-04-24 12:18:14 -07:00
Andy Hung
980d25ea4a Merge "Increase AudioTrack and AudioRecord max sample rate to 192kHz" 2015-04-24 19:16:21 +00:00
Tor Norbye
1fd75d83c3 Merge "Add permission requirement annotation for KeyGuard" 2015-04-24 18:54:26 +00:00
Santos Cordon
d974380564 Merge "Fix up DisconnectCause description." 2015-04-24 18:37:38 +00:00
Santos Cordon
c1ec931f00 Fix up DisconnectCause description. 
Change-Id: Ib2b52b6f8bc8fe945df3684f4e1ed9e04f78b061
 2015-04-24 11:37:07 -07:00
Alex Klyubin
9716b081a6 am edf5454a: am 3167fb4b: am 71223ebe: Merge "Reset AndroidKeyStore Mac and Cipher state when init fails." 
* commit 'edf5454a14cc53de92eaf1ef15fcfb21d8caccca':
  Reset AndroidKeyStore Mac and Cipher state when init fails.
 2015-04-24 18:35:37 +00:00
Olawale Ogunwale
a298a96af7 am 3846d3a4: am 6d856bfb: am cf7d2d95: Merge "[ActivityManager] Avoid orphan ContentProviderRecord." 
* commit '3846d3a4c5d79a9d7e86e43c64a5c21a29036de0':
  [ActivityManager] Avoid orphan ContentProviderRecord.
 2015-04-24 18:35:29 +00:00
Leon Scroggins III
ff0bae7dbc am fddbcd85: (-s ours) 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 'fddbcd857fda28213917ef81375514bffc4a6d68':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-24 18:22:00 +00:00
Leon Scroggins III
08a7c50cbe am 38b84b6d: (-s ours) am 60d7c9fc: am 6db29a92: am f828f43f: am 38cf068c: am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit '38b84b6d765302c8325ad10109e43227ce8e8156':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-24 18:21:53 +00:00
Scott Rowe
1db13a9010 am 6a6bfe5e: am 6e5063fe: docs: Supported media protocols, codecs, formats for Android TV 
* commit '6a6bfe5e84b598f24d73138523d7f8d88729daed':
  docs: Supported media protocols, codecs, formats for Android TV
 2015-04-24 18:21:42 +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
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
Alan Viverette
6e37e5a006 Merge "Implement RTL support in framework ViewPager, DatePicker" 2015-04-24 18:06:50 +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
dcashman
38dee0568b Merge "Remove line wrapping for publickey encoding." 2015-04-24 17:57:35 +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
Mark Renouf
e2725f87b4 am f237bce8: am 99d49300: am 55555a3d: Fixes rejected dismiss gestures (framework version of ag/677161) 
* commit 'f237bce8c3bb4ac31a4c5eaa732de95d5b469f34':
  Fixes rejected dismiss gestures (framework version of ag/677161)
 2015-04-24 17:54:33 +00:00
dcashman
8a33121ad9 Remove line wrapping for publickey encoding. 
This adds unnecessary whitespace in packages.xml and is contrary to the approach
taken by certs.  Remove it.

Change-Id: I217bb94af97c3b38dab1fd806ffe7b7600fa6fdd
 2015-04-24 10:52:56 -07:00
Alex Klyubin
71223ebe1b Merge "Reset AndroidKeyStore Mac and Cipher state when init fails." 2015-04-24 17:52:36 +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
Wale Ogunwale
10cb22433d Merge "Cleaned-up unused session argument." 2015-04-24 17:34:55 +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
Chien-Yu Chen
e79449aed0 Merge "camera2: validate reprocess request's session" 2015-04-24 17:14:50 +00:00
Jae Seo
431497175c Merge "TIF: Start using the @NonNull annotation" 2015-04-24 17:10:19 +00:00
Tor Norbye
6de5f43986 Merge "Add permission annotations to the Browser" 2015-04-24 17:08:11 +00:00
Wale Ogunwale
a6ab5c4efb Cleaned-up unused session argument. 
Change-Id: Iff9d0df5f1643c581767a41a1ba4b1d43e5b45d8
 2015-04-24 09:00:41 -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
Nicolas Prevot
7defaef1bf Merge "Restrict setting the profile/device owner with a signature-level permission." 2015-04-24 15:08:02 +00:00
John Spurlock
f74a212ffb Merge "AudioService: Fix mConnectedDevices iteration issues." 2015-04-24 14:50:09 +00:00
John Reck
c552da4324 Merge "Teach LA how to destroy" 2015-04-24 14:33:02 +00:00
John Reck
6b5a01b7e5 Merge "Move LinearAlloc to libhuwi" 2015-04-24 14:32:50 +00:00
Keisuke Kuroyanagi
5dbaefadd7 Merge "Quit showing "SELECT ALL" for inappropriate fields." 2015-04-24 11:40:58 +00:00