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

191191 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin Lee
4ee45178c8 am dbb03371: am 6e761c5d: Merge "Device policy: use owner label instead of name" into mnc-dev 
* commit 'dbb03371cea085f06de3e9cfb255efaad9a97d4e':
  Device policy: use owner label instead of name
 2015-05-01 13:20:13 +00:00
Robin Lee
dbb03371ce am 6e761c5d: Merge "Device policy: use owner label instead of name" into mnc-dev 
* commit '6e761c5d6b8ed2126c6544ce32db569203c46e2a':
  Device policy: use owner label instead of name
 2015-05-01 13:08:45 +00:00
Robin Lee
6e761c5d6b Merge "Device policy: use owner label instead of name" into mnc-dev 2015-05-01 12:57:37 +00:00
Narayan Kamath
7953b958f4 am c2b1f93c: am 2d7d9523: am a78240ba: AlarmManager: Reject non-olson timezones for targetSdk >= M 
* commit 'c2b1f93c70cadfed69b8ad9114de7c8cfcaef3e2':
  AlarmManager: Reject non-olson timezones for targetSdk >= M
 2015-05-01 11:26:47 +00:00
Narayan Kamath
c2b1f93c70 am 2d7d9523: am a78240ba: AlarmManager: Reject non-olson timezones for targetSdk >= M 
* commit '2d7d952323a11e0fcf8b2d435ba857d45af05503':
  AlarmManager: Reject non-olson timezones for targetSdk >= M
 2015-05-01 11:15:54 +00:00
Narayan Kamath
2d7d952323 am a78240ba: AlarmManager: Reject non-olson timezones for targetSdk >= M 
* commit 'a78240ba5f891c3fd0acb62a1b13b6dc1bbe9705':
  AlarmManager: Reject non-olson timezones for targetSdk >= M
 2015-05-01 11:04:54 +00:00
Narayan Kamath
a78240ba5f AlarmManager: Reject non-olson timezones for targetSdk >= M 
This has caused a lot of grief, confusion and outright broken
behaviour due to the fact that the Posix spec and the Java spec
define conflicting interpretations of "custom" timezones like
GMT+5:30 (eastern hemisphere for java, western for posix).

bug: 19987403
bug: 19106773
Change-Id: Ia9b007067bb175b0805d4262f17390a0bd98d927
 2015-05-01 09:39:25 +00:00
Wei Wang
3af0a8e48d am 17004d63: am 342c22a5: am f2cfe6c0: Merge "Fix a bug in ScanSettings constructor." into mnc-dev 
* commit '17004d636712c092d7ac8fdfcf933572481cebfb':
  Fix a bug in ScanSettings constructor.
 2015-05-01 09:19:54 +00:00
Wei Wang
17004d6367 am 342c22a5: am f2cfe6c0: Merge "Fix a bug in ScanSettings constructor." into mnc-dev 
* commit '342c22a5973386d5a5fdb0b552a26f51920cb026':
  Fix a bug in ScanSettings constructor.
 2015-05-01 08:48:14 +00:00
Gus Prevas
cdc8a8bf5b am cf6f4e4e: am 25e99ce6: am 043d7a94: am 12b1b8ed: am 026e204e: Fixes velocity tracking bug in SwipeDismissLayout. 
* commit 'cf6f4e4e4d1a6e13ac7919b03d2561bc54b9f679':
  Fixes velocity tracking bug in SwipeDismissLayout.
 2015-05-01 08:47:05 +00:00
Gus Prevas
cf6f4e4e4d am 25e99ce6: am 043d7a94: am 12b1b8ed: am 026e204e: Fixes velocity tracking bug in SwipeDismissLayout. 
* commit '25e99ce6d6e3191282a08b115d4b703277d19cd1':
  Fixes velocity tracking bug in SwipeDismissLayout.
 2015-05-01 07:59:43 +00:00
Wei Wang
342c22a597 am f2cfe6c0: Merge "Fix a bug in ScanSettings constructor." into mnc-dev 
* commit 'f2cfe6c0a9c49d4e47c269ac1ff76b757d9dd8a9':
  Fix a bug in ScanSettings constructor.
 2015-05-01 07:59:07 +00:00
Wei Wang
f2cfe6c0a9 Merge "Fix a bug in ScanSettings constructor." into mnc-dev 2015-05-01 07:51:40 +00:00
Wei Wang
c5065ee98d Fix a bug in ScanSettings constructor. 
Change-Id: I36e6effe8063bacddd61fe2c47c0360d7ffaee71
 2015-05-01 00:50:32 -07:00
Gus Prevas
25e99ce6d6 am 043d7a94: am 12b1b8ed: am 026e204e: Fixes velocity tracking bug in SwipeDismissLayout. 
* commit '043d7a94ab3f3c744a5fe6a64e9f6375cd89b9cd':
  Fixes velocity tracking bug in SwipeDismissLayout.
 2015-05-01 07:49:31 +00:00
Gus Prevas
043d7a94ab am 12b1b8ed: am 026e204e: Fixes velocity tracking bug in SwipeDismissLayout. 
* commit '12b1b8ed3b5bfe623cd69d3cdafd8b6b5dfe68d8':
  Fixes velocity tracking bug in SwipeDismissLayout.
 2015-05-01 07:36:43 +00:00
Wei Wang
3b72899c71 am c869bbfd: am 50b37f8c: am c90c7604: Merge "Honor Ble scanning settings from Settings UI." into mnc-dev 
* commit 'c869bbfd94549039624f76740f9bf858b25cfa56':
  Honor Ble scanning settings from Settings UI.
 2015-05-01 05:41:17 +00:00
Wei Wang
c869bbfd94 am 50b37f8c: am c90c7604: Merge "Honor Ble scanning settings from Settings UI." into mnc-dev 
* commit '50b37f8c6a7237af29f533b83ee2176301d107ea':
  Honor Ble scanning settings from Settings UI.
 2015-05-01 05:30:36 +00:00
Wei Wang
50b37f8c6a am c90c7604: Merge "Honor Ble scanning settings from Settings UI." into mnc-dev 
* commit 'c90c760431bce5ce3f7f86b0e7e5e939c2db6a38':
  Honor Ble scanning settings from Settings UI.
 2015-05-01 05:18:17 +00:00
Wei Wang
c90c760431 Merge "Honor Ble scanning settings from Settings UI." into mnc-dev 2015-05-01 05:10:18 +00:00
Lorenzo Colitti
0c12125e00 am ad44d814: am 3dc08220: am b57f236e: Merge changes Icf7d67e2,Ia914ec88,I2490ad75,Ie79f2d28 into mnc-dev 
* commit 'ad44d81457971085a0b20fb42388010d76c79132':
  Add a hidden method to clear NetworkCapabilities.
  Fix javadoc error for requestNetwork.
  Simplify network callback handling code.
  Document and unhide CALLBACK_PRECHECK.
 2015-05-01 04:19:07 +00:00
Lorenzo Colitti
ad44d81457 am 3dc08220: am b57f236e: Merge changes Icf7d67e2,Ia914ec88,I2490ad75,Ie79f2d28 into mnc-dev 
* commit '3dc082200a1f425ab579e2082c0d70eefa399b8b':
  Add a hidden method to clear NetworkCapabilities.
  Fix javadoc error for requestNetwork.
  Simplify network callback handling code.
  Document and unhide CALLBACK_PRECHECK.
 2015-05-01 04:04:03 +00:00
Lorenzo Colitti
3dc082200a am b57f236e: Merge changes Icf7d67e2,Ia914ec88,I2490ad75,Ie79f2d28 into mnc-dev 
* commit 'b57f236e30d87bdfa69bb99e6b3f5ec6a3cc07c7':
  Add a hidden method to clear NetworkCapabilities.
  Fix javadoc error for requestNetwork.
  Simplify network callback handling code.
  Document and unhide CALLBACK_PRECHECK.
 2015-05-01 03:52:10 +00:00
Lorenzo Colitti
b57f236e30 Merge changes Icf7d67e2,Ia914ec88,I2490ad75,Ie79f2d28 into mnc-dev 
* changes:
  Add a hidden method to clear NetworkCapabilities.
  Fix javadoc error for requestNetwork.
  Simplify network callback handling code.
  Document and unhide CALLBACK_PRECHECK.
 2015-05-01 03:45:14 +00:00
Lorenzo Colitti
f7058f5d1d Add a hidden method to clear NetworkCapabilities. 
Change-Id: Icf7d67e24a09113340e9bff2c72526760914ef48
 2015-05-01 12:36:29 +09:00
Lorenzo Colitti
2ea89e59c3 Fix javadoc error for requestNetwork. 
The ConnectivityManager documentation uses {@link requestNetwork}
without specifying which version of that method it refers to.
This results in javadoc incorrectly linking to the version of the
method that takes a PendingIntent instead of the version that
takes a callback.

Change-Id: Ia914ec88005a6401b6391c5b4fc92f988baa3922
 2015-05-01 12:36:29 +09:00
Lorenzo Colitti
db95a60981 Simplify network callback handling code. 
Change-Id: I2490ad754bf2a1282f27302c8556fb19983cc6b1
 2015-05-01 12:36:28 +09:00
Lorenzo Colitti
0708693f1e Document and unhide CALLBACK_PRECHECK. 
Bug: 20038463
Change-Id: Ie79f2d28c06cf611289504e49c471b55ffb9890f
 2015-05-01 12:36:28 +09:00
Robert Shih
043b26ba9a am 4816ebe8: am e8a8440d: am f1207122: Merge "MediaPlayer: provide mime type for all track types" into mnc-dev 
* commit '4816ebe8c2f312bca44d95abdfec0dba137c4fd4':
  MediaPlayer: provide mime type for all track types
 2015-05-01 01:35:13 +00:00
Miao Wang
af46061300 am 815335ec: am 663ba954: am bbfa9b23: Merge "[RenderScript] typo fix in BLAS, TRMM & TSMM" into mnc-dev 
* commit '815335ec447ce201968e790b30965064e3719bda':
  [RenderScript] typo fix in BLAS, TRMM & TSMM
 2015-05-01 01:35:07 +00:00
tturney
5d818eb675 am 129a0b8b: am 94d7494a: am 56c58a2e: Merge "Fix typo. bug: b/20610710" into mnc-dev 
* commit '129a0b8bf9a0e531792ac576d217fbc6e0de96c6':
  Fix typo. bug: b/20610710
 2015-05-01 01:35:02 +00:00
Lajos Molnar
f0afeb2373 am 0486d03d: am 607dab36: am 05ebffe6: media: Hook up MediaPlayer and MediaSync to new settings 
* commit '0486d03dc0c843f31852afc2812c934f10aeb21e':
  media: Hook up MediaPlayer and MediaSync to new settings
 2015-05-01 01:34:53 +00:00
Alan Viverette
da954c6b92 am 022fd57a: am 343affaf: am aba035d2: Merge "Fix layoutlib build breakage" into mnc-dev 
* commit '022fd57acb9d99e58868c0b319e572a9765f73cb':
  Fix layoutlib build breakage
 2015-05-01 01:34:28 +00:00
Andrew Lee
10821f9920 am c493f43f: am 972e0c7b: am 5b8b0df7: Merge "Add handler parameter for callbacks." into mnc-dev 
* commit 'c493f43fe1f0b7b1ed62ae85065d7c8f66803273':
  Add handler parameter for callbacks.
 2015-05-01 01:34:19 +00:00
Rich Slogar
33a7afb68f am a84f7a4e: am 8b28b348: am 7dc7d09b: am a1c7176b: am a03e2658: am 7c267f66: am f4b1df34: am 2a3aa2d3: docs: studio 1.2 updates 
* commit 'a84f7a4ee368db47b9f80cace4d6a3dfc8585b16':
 2015-05-01 01:33:55 +00:00
Rich Slogar
b769da1488 am 0a49ee4e: am b4cfe2f2: am 8febd74e: am 7fbde8f5: am 408aeb05: am b6ad1ce8: am 541dda1c: am 999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs 
* commit '0a49ee4e853e18b273bf438b49066a6d1dfc2969':
 2015-05-01 01:33:50 +00:00
Rich Slogar
73498c52df am 55024470: am e0d04773: am 9c6e6050: am ac9c751d: am 62cfe97d: am 2653774a: am b874dc04: am 07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs 
* commit '550244708428b02ac26bc72e26fd7479a76fa7df':
 2015-05-01 01:33:45 +00:00
Rich Slogar
afef5776dd am 3fae5ee4: am 18d356a7: am 50c29a3e: am 994d6ffe: am 7a258afa: am af73c6e7: am ff24e8e1: am 5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs 
* commit '3fae5ee4e815241a2f739139dc1614847611dda2':
 2015-05-01 01:33:39 +00:00
Rich Slogar
ac23c6ebf8 am f992b408: am d7906a1a: am 24863faa: Merge "resolved conflicts for merge of edf44562 to mnc-dev" into mnc-dev 
* commit 'f992b4082dc083e1a8f0312cd423da3e270514bd':
  docs: studio 1.2 updates
 2015-05-01 01:33:28 +00:00
Miao Wang
7b3c1bb571 am 834f0f23: am c1000a39: am 8724d359: Merge "[RenderScript] typo fix in rs BLAS jni, to correctly handle complex params." into mnc-dev 
* commit '834f0f23df9d7bc237f04e9dc87fc0b319552dfa':
  [RenderScript] typo fix in rs BLAS jni, to correctly handle complex params.
 2015-05-01 01:33:21 +00:00
Miao Wang
467a746324 am f8d6dd69: am 7d581218: am 01060a33: Merge "[RenderScript] fix edges cases about Transpose for SYMM & SYR2K" into mnc-dev 
* commit 'f8d6dd69183983a3df2ff4da1bcbb02c403f5bc9':
  [RenderScript] fix edges cases about Transpose for SYMM & SYR2K
 2015-05-01 01:33:15 +00:00
Alan Viverette
ec48536d30 am 4cff05e1: am 87706358: am ac7927a8: Merge "LayoutInflater should always try to generate LayoutParams for include" into mnc-dev 
* commit '4cff05e1f7ec780f1ab0b77202453867eaf146f3':
  LayoutInflater should always try to generate LayoutParams for include
 2015-05-01 01:33:00 +00:00
Alex Klyubin
0219269280 am c89e1a96: am c8b068ce: am cf2999aa: Merge "Handle KM_ERROR_CALLER_NONCE_PROHIBITED." into mnc-dev 
* commit 'c89e1a96c5e4cc16928341f30a45e315d1a4abb6':
  Handle KM_ERROR_CALLER_NONCE_PROHIBITED.
 2015-05-01 01:32:53 +00:00
John Reck
6dc2c89b49 am 0385dc8d: am 1d8aae3b: am db672b03: Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev 
* commit '0385dc8d12088d98ab76de86db4cd8e1ffa34af7':
  Change how Java Bitmaps are accessed in a few places
 2015-05-01 01:32:46 +00:00
Alex Klyubin
ab5ed9d2b6 am c9122d6f: am 07a2ebd3: am 0069301d: Merge "Fix thread affinity of FingerprintManager." into mnc-dev 
* commit 'c9122d6fe29411eb02e91c7713a450aba94b65e3':
  Fix thread affinity of FingerprintManager.
 2015-05-01 01:32:41 +00:00
Todd Kennedy
6b379c8a34 am 9c14b3ab: am c7e9a17a: am 10a54a79: Merge "Remove dependency upon FragmentActivity" into mnc-dev 
* commit '9c14b3ab0d6e42031d0465114a979b644c6890d2':
  Remove dependency upon FragmentActivity
 2015-05-01 01:32:25 +00:00
Glenn Kasten
7a03833756 am cc2f85a4: am f7de1bc8: am 2757fed2: Merge "Clarifying which receiver method to call." into mnc-dev 
* commit 'cc2f85a406fac0b18e44006c62fbd5aa603cbbe1':
  Clarifying which receiver method to call.
 2015-05-01 01:32:06 +00:00
Alex Klyubin
753ac84591 am 9b6b6656: am 35e87811: am 033dc46b: Merge "Switch from FingerprintService to FingerprintManager." into mnc-dev 
* commit '9b6b6656b8848a2347996fab7f802b49edc8147f':
  Switch from FingerprintService to FingerprintManager.
 2015-05-01 01:31:56 +00:00
Alex Klyubin
3dbeb7e5ea am dac77549: am 91725e78: am 3cd8ec3c: Merge "Cleanup logic for per-op auth keys." into mnc-dev 
* commit 'dac775492fa78baaaed64501dfd25a2eaefe275e':
  Cleanup logic for per-op auth keys.
 2015-05-01 01:31:51 +00:00
Mady Mellor
304169fdd0 Merge "resolved conflicts for merge of 04f2fe39 to master" 2015-05-01 01:28:46 +00:00