summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Expose AES GCM backed by Android Keystore.Alex Klyubin2015-06-179-12/+630
* Merge "Harden KeyInfo." into mnc-devAlex Klyubin2015-06-161-6/+8
|\
| * Harden KeyInfo.Alex Klyubin2015-06-161-6/+8
* | Merge "Camera: Adjust intrinsic transform coordinate system." into mnc-devEino-Ville Talvala2015-06-162-7/+36
|\ \
| * | Camera: Adjust intrinsic transform coordinate system.Eino-Ville Talvala2015-06-162-7/+36
* | | Merge "Harden and clean up KeyProtection." into mnc-devAlex Klyubin2015-06-162-17/+17
|\ \ \ | | |/ | |/|
| * | Harden and clean up KeyProtection.Alex Klyubin2015-06-162-17/+17
* | | Merge "Harden and clean up KeyGenParameterSpec." into mnc-devAlex Klyubin2015-06-162-34/+73
|\ \ \ | |/ / | | / | |/ |/|
| * Harden and clean up KeyGenParameterSpec.Alex Klyubin2015-06-162-34/+73
* | Merge "Deprecate SHA-1 in ManagedProvisioning (API doc change)" into mnc-devRubin Xu2015-06-161-5/+11
|\ \
| * | Deprecate SHA-1 in ManagedProvisioning (API doc change)Rubin Xu2015-06-151-5/+11
* | | Merge "disable verbose logs from people notifications." into mnc-devChris Wren2015-06-161-10/+10
|\ \ \
| * | | disable verbose logs from people notifications.Chris Wren2015-06-161-10/+10
* | | | Merge "Improved zipping logic so it zips chunks, instead of the whole file at...Felipe Leme2015-06-161-23/+5
|\ \ \ \
| * | | | Improved zipping logic so it zips chunks, instead of the whole file at once, ...Felipe Leme2015-06-161-23/+5
* | | | | Merge "Fix null deref" into mnc-devJohn Reck2015-06-161-2/+6
|\ \ \ \ \
| * | | | | Fix null derefJohn Reck2015-06-161-2/+6
* | | | | | Merge "Additional OP_READ_PHONE_STATE AppOps checks for telephony" into mnc-devFyodor Kupolov2015-06-162-33/+33
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Additional OP_READ_PHONE_STATE AppOps checks for telephonyFyodor Kupolov2015-06-102-33/+33
* | | | | | Merge "Changed BugReportReceiver to send zipped bugreports." into mnc-devFelipe Leme2015-06-161-22/+118
|\ \ \ \ \ \
| * | | | | | Changed BugReportReceiver to send zipped bugreports.Felipe Leme2015-06-161-22/+118
* | | | | | | Merge "Allow 3P apps to provide structured data within AssistContent." into m...Chirag Shah2015-06-163-0/+30
|\ \ \ \ \ \ \
| * | | | | | | Allow 3P apps to provide structured data within AssistContent.Chirag Shah2015-06-153-0/+30
* | | | | | | | Merge "Add ic_dialog_alert_material to symbols" into mnc-devJason Monk2015-06-161-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Add ic_dialog_alert_material to symbolsJason Monk2015-06-161-0/+1
* | | | | | | | | Merge "Fix issue #21816660 (app standby), work on issue #20882522 (voice inte...Dianne Hackborn2015-06-162-61/+89
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix issue #21816660 (app standby), work on issue #20882522 (voice interact)Dianne Hackborn2015-06-152-61/+89
* | | | | | | | | | Merge "Fix floating toolbar flickers." into mnc-devAbodunrinwa Toki2015-06-162-51/+58
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix floating toolbar flickers.Abodunrinwa Toki2015-06-162-51/+58
* | | | | | | | | | | Merge "Have the final setVisibility cause a requestLayout." into mnc-devGeorge Mount2015-06-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Have the final setVisibility cause a requestLayout.George Mount2015-06-151-1/+1
* | | | | | | | | | | | jni: isLoggable calls __android_log_is_loggableMark Salyzyn2015-06-161-25/+1
| |_|_|/ / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge "Update documentation for PASSWORD_QUALITY_SOMETHING" into mnc-devBenjamin Franz2015-06-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update documentation for PASSWORD_QUALITY_SOMETHINGBenjamin Franz2015-06-161-1/+1
* | | | | | | | | | | | Merge "Add suggested width for Floating Toolbar on large devices" into mnc-devClara Bayarri2015-06-161-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Add suggested width for Floating Toolbar on large devicesClara Bayarri2015-06-151-0/+2
* | | | | | | | | | | | Merge "Floating toolbar no longer obstructs the soft keyboard." into mnc-devAbodunrinwa Toki2015-06-161-30/+69
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Floating toolbar no longer obstructs the soft keyboard.Abodunrinwa Toki2015-06-151-30/+69
* | | | | | | | | | | | | Merge "Better systrace slices for application startup." into mnc-devNarayan Kamath2015-06-165-5/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Better systrace slices for application startup.Narayan Kamath2015-06-165-5/+23
* | | | | | | | | | | | | | Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc...Paul Jensen2015-06-166-165/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove dead hidden ConnectivityManager and NetworkInfo APIs.Paul Jensen2015-06-166-165/+3
* | | | | | | | | | | | | | Yet another user restriction.Jeff Sharkey2015-06-155-0/+17
* | | | | | | | | | | | | | Merge "Update file size formatting." into mnc-devJeff Sharkey2015-06-164-26/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Update file size formatting.Jeff Sharkey2015-06-154-26/+63
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Fixed a bug where the statusbar was still visible while dozing" into m...Selim Cinek2015-06-161-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fixed a bug where the statusbar was still visible while dozingSelim Cinek2015-06-151-2/+5
* | | | | | | | | | | | | | | Merge "Limit number of fingerprint templates that can be enrolled per device ...Jim Miller2015-06-163-6/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Limit number of fingerprint templates that can be enrolled per device userJim Miller2015-06-153-6/+22
* | | | | | | | | | | | | | | | Merge "Add a test that Network#getNetworkHandle() behaves sanely." into mnc-devErik Kline2015-06-162-0/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | |