Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
190,742 Commits 3 Branches 0 Tags
107cd552f1d88ae22fde0284f4a64f78eaadfbc1
Commit Graph

47474 Commits

Author SHA1 Message Date
Svet Ganov
107cd552f1 am 17daa3d0: am 574f5379: Merge "Add body sensors app op - framework base" into mnc-dev 
* commit '17daa3d02c6427b086710ca6d386202cde47c6ae':
  Add body sensors app op - framework base
 2015-05-01 23:34:54 +00:00
Svet Ganov
574f53793d Merge "Add body sensors app op - framework base" into mnc-dev 2015-05-01 23:09:52 +00:00
Chris Craik
6e51a707ea am 378510c3: am 106f88c8: Merge "Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""" into mnc-dev 
* commit '378510c3aecf958871e4d9b35b9bb5e80f5e9ea2':
  Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""
 2015-05-01 22:05:57 +00:00
Chris Craik
31a2d063df Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty"" 
Fixes breakage from HwAccelerationTest

This reverts commit b2847afde2.

Change-Id: I762b3c9020fc1d06bac61ffa8b956049147515b1
 2015-05-01 14:30:15 -07:00
Chris Craik
9eeb725d91 am 3deb109a: am 5c705c59: Merge "Fix build." into mnc-dev 
* commit '3deb109a7423eddf51b6242378123f09cd56c69e':
  Fix build.
 2015-05-01 21:25:36 +00:00
Chris Craik
e920b1459a am 2551857f: am f4ff8f70: Merge "Merge getDisplayList and updateDisplayListIfDirty" into mnc-dev 
* commit '2551857feed723c30759a40ae9429110c453d2d3':
  Merge getDisplayList and updateDisplayListIfDirty
 2015-05-01 21:03:49 +00:00
Chris Craik
ed8623690b am 3059dbb6: am 04c0f415: Merge "Update alpha documentation" into mnc-dev 
* commit '3059dbb65ac77e663fb4e89317fcafa3d2f6d9e2':
  Update alpha documentation
 2015-05-01 21:03:44 +00:00
Jorim Jaggi
83fb90f61f am 3f5f1cb6: am 0629a5d5: Merge "Rename supportsAssistGesture to supportsAssist" into mnc-dev 
* commit '3f5f1cb66441e9dd42a6d295c33e08b1f956fff6':
  Rename supportsAssistGesture to supportsAssist
 2015-05-01 21:03:39 +00:00
Chris Craik
5c705c595d Merge "Fix build." into mnc-dev 2015-05-01 21:01:14 +00:00
Chris Craik
b2847afde2 Fix build. 
Revert "Merge getDisplayList and updateDisplayListIfDirty"

This reverts commit f85d064b53.

Change-Id: I8b1566aba67c385d72759ea2aea16edcd8477813
 2015-05-01 21:01:01 +00:00
Svet Ganov
b9d71a6f89 Add body sensors app op - framework base 
Change-Id: Idd5cd573fab3405e5b2a6e51d2d9d115650826e9
 2015-05-01 13:56:04 -07:00
Chris Craik
f4ff8f701f Merge "Merge getDisplayList and updateDisplayListIfDirty" into mnc-dev 2015-05-01 20:36:22 +00:00
Chris Craik
04c0f415b5 Merge "Update alpha documentation" into mnc-dev 2015-05-01 20:36:03 +00:00
Jorim Jaggi
0629a5d524 Merge "Rename supportsAssistGesture to supportsAssist" into mnc-dev 2015-05-01 20:34:22 +00:00
Jorim Jaggi
5f560d0562 Rename supportsAssistGesture to supportsAssist 
Bug: 20642759
Change-Id: Idddc786980244cc94570d04fd414540bbad60448
 2015-05-01 13:33:38 -07:00
Alan Viverette
f71c93ff9a am aeedef55: am da0d6a6b: Merge "Correctly handle intercepted touch events in FastScroller" into mnc-dev 
* commit 'aeedef552d64027d7de40d4cc13c182f97250b6e':
  Correctly handle intercepted touch events in FastScroller
 2015-05-01 18:48:46 +00:00
Ruben Brunk
128a2fa002 am 626cd0fb: am 0f2be13d: camera: Update Camera2 API for arbitration. 
* commit '626cd0fbc45947ccc7fa6022b8daa000e4c04258':
  camera: Update Camera2 API for arbitration.
 2015-05-01 18:48:41 +00:00
Fabrice Di Meglio
620649263f am 359b96e5: am 83bb765b: Merge "Add IntentFilter auto verification - part 7" into mnc-dev 
* commit '359b96e5560211c757027b4f2df59f69e7d5514f':
  Add IntentFilter auto verification - part 7
 2015-05-01 18:48:31 +00:00
Yohei Yukawa
784480b62c am 71cbadf3: am 097d5f10: Merge "Suggestions popup must be dismissed before device rotation." into mnc-dev 
* commit '71cbadf3971c67a839d91c6685ba88c9b938b1ce':
  Suggestions popup must be dismissed before device rotation.
 2015-05-01 18:48:20 +00:00
Amith Yamasani
bd898e707b am 17d5e266: am 92d42057: Merge "Exclude bound app widgets from idle app list" into mnc-dev 
* commit '17d5e2660663b4c09b3e94c9a92d8e80f657ed95':
  Exclude bound app widgets from idle app list
 2015-05-01 18:48:15 +00:00
Alan Viverette
da0d6a6b8a Merge "Correctly handle intercepted touch events in FastScroller" into mnc-dev 2015-05-01 18:30:26 +00:00
Ruben Brunk
0f2be13dc6 camera: Update Camera2 API for arbitration. 
- Update documentation for new arbitration behavior.
- Ensure an appropriate error is thrown when calling
  open while an existing, higher-priority user holds
  the camera device.

Bug: 19186859
Change-Id: I486193c14b7fd5dc6ce30c1b7471669c009d64b3
 2015-05-01 18:28:13 +00:00
Fabrice Di Meglio
83bb765b04 Merge "Add IntentFilter auto verification - part 7" into mnc-dev 2015-05-01 18:27:32 +00:00
Yohei Yukawa
097d5f1073 Merge "Suggestions popup must be dismissed before device rotation." into mnc-dev 2015-05-01 18:27:05 +00:00
Fabrice Di Meglio
1de3f0dcaf Add IntentFilter auto verification - part 7 
- update packages priming so that it effectively save its data
- use ArraySet instead of ArrayList for list of domains (a set
is preferable as we dont want duplicates)

See bug #19628909

Change-Id: I52085f4bc28dcbc7fbc02ba0898abcd4ae9cf1e2
 2015-05-01 11:24:44 -07:00
Amith Yamasani
92d420579b Merge "Exclude bound app widgets from idle app list" into mnc-dev 2015-05-01 18:21:43 +00:00
Dan Sandler
a89899a324 am 548f4d6c: am 9fc943d1: Merge "Icon: a clean, parcelable place for images." into mnc-dev 
* commit '548f4d6c7089dc262f47b18542566b0a72807ac6':
  Icon: a clean, parcelable place for images.
 2015-05-01 18:19:20 +00:00
Doris Liu
b343db76aa am 3ebbc50c: am 27cfed7b: Merge "Make sure transform matrix is applied when hardware layer is re-created" into mnc-dev 
* commit '3ebbc50c3f2d3b8939e02fb22cef1dc1c2cc8a66':
  Make sure transform matrix is applied when hardware layer is re-created
 2015-05-01 18:19:10 +00:00
Amith Yamasani
e4a8da8ea2 Exclude bound app widgets from idle app list 
Track package names of bound app widgets and use the list when
querying for idle apps.

Bug: 20066058
Change-Id: If8039397a061ef04bb13aa38d57cd7f0221f5fc7
 2015-05-01 11:17:27 -07:00
Dan Sandler
9fc943d1a6 Merge "Icon: a clean, parcelable place for images." into mnc-dev 2015-05-01 17:57:14 +00:00
Doris Liu
27cfed7ba5 Merge "Make sure transform matrix is applied when hardware layer is re-created" into mnc-dev 2015-05-01 17:54:44 +00:00
Dan Sandler
b9f7aac348 Icon: a clean, parcelable place for images. 
Binder APIs which wish to consume Bitmaps *and* drawable
resources can now do so by using Icon, a kind of union type
that accommodates each of these. Icon also accepts byte
arrays holding compressed Bitmaps (PNG, JPEG, etc), which
saves clients the additional memory cost of decoding and
sending full uncompressed bitmaps through Binder interfaces.
Receiving clients can call loadDrawable{,Async} and then
getDrawable to start immediately using the image in an
ImageView or other Drawable-hosting container.

Bug: 19609468
Change-Id: Ic1343711c2ac0b15876b46f0b6008b0108a49470
 2015-05-01 13:44:42 -04:00
Alan Viverette
fb99ba895e Correctly handle intercepted touch events in FastScroller 
Previously we'd return true from onIntercept and assume the DOWN event
was handled, then onTouch would return false and the host view would
receive the DOWN event. Now we consume the event in onTouch.

Bug: 19080751
Change-Id: I1bd35b4c25a0760f4248ade443d09b8ca4b71e7c
 2015-05-01 10:10:15 -07:00
Jeff Sharkey
399199fe82 am 3b342179: am a320505f: Merge "Move both app code and data together." into mnc-dev 
* commit '3b3421796f154e846797a534cae25e97478d35bc':
  Move both app code and data together.
 2015-05-01 16:45:49 +00:00
Jeff Sharkey
a320505f3a Merge "Move both app code and data together." into mnc-dev 2015-05-01 16:22:46 +00:00
John Reck
1ad0936c77 am 7e22cc99: am 78760b4a: Merge "A bunch more cleanups" into mnc-dev 
* commit '7e22cc9965b440a7f34b18cbbec1818f7b7ac68e':
  A bunch more cleanups
 2015-05-01 15:00:38 +00:00
John Reck
78760b4ae4 Merge "A bunch more cleanups" into mnc-dev 2015-05-01 14:42:51 +00:00
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
6e761c5d6b Merge "Device policy: use owner label instead of name" into mnc-dev 2015-05-01 12:57:37 +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
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
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
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
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
c90c760431 Merge "Honor Ble scanning settings from Settings UI." into mnc-dev 2015-05-01 05:10:18 +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
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