Commit Graph

46308 Commits

Author SHA1 Message Date
Chad Brubaker
85d787d336 am c217adaf: am 9db6e4d7: am 5aeb0853: Merge "Enforce tag types in KeymasterArgument classes"
* commit 'c217adaf6756003684d195713dda8a9b215f5dbc':
  Enforce tag types in KeymasterArgument classes
2015-03-25 21:07:41 +00:00
Alan Viverette
16802f0de2 am 46c95313: am ddb30cd3: am 7506f499: Merge "Fix to crash when clicking text link without view activity"
* commit '46c953138298285d9cb06a75030fc73081ccc121':
  Fix to crash when clicking text link without view activity
2015-03-25 21:07:34 +00:00
Jim Miller
63c8c4937e Fix the build
Change-Id: I15cc8d517a1713b003aad396aa5d2b29cb808338
2015-03-25 14:06:02 -07:00
Prerepa Viswanadham
e564c00e2b Merge "Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge" 2015-03-25 20:02:29 +00:00
Jim Miller
9fc9ac5f77 Merge "Refactor fingerprint API" 2015-03-25 19:45:29 +00:00
Amith Yamasani
f198900250 Merge "Fix documentation for ACTION_SET_PROFILE_OWNER" 2015-03-25 19:37:43 +00:00
Chad Brubaker
9db6e4d7a3 am 5aeb0853: Merge "Enforce tag types in KeymasterArgument classes"
* commit '5aeb085389954a32e1ea2189b7bec8080b0226c5':
  Enforce tag types in KeymasterArgument classes
2015-03-25 19:03:28 +00:00
Alan Viverette
ddb30cd36f am 7506f499: Merge "Fix to crash when clicking text link without view activity"
* commit '7506f499b523d05c6bca5acb6d83f55820d33771':
  Fix to crash when clicking text link without view activity
2015-03-25 19:03:21 +00:00
Roozbeh Pournader
d1af05efb0 Merge "Make Html#toHTML() generate correct bidi directions." 2015-03-25 18:49:51 +00:00
Amith Yamasani
814e9873bd Fix documentation for ACTION_SET_PROFILE_OWNER
Does not require the mentioned permissions.

Bug: 19892754
Change-Id: I22f2563c4f50457dbeb22d734e96a99ef79adf2b
2015-03-25 11:11:54 -07:00
Chad Brubaker
5aeb085389 Merge "Enforce tag types in KeymasterArgument classes" 2015-03-25 18:00:48 +00:00
Andrei Kapishnikov
be22970dc2 Merge "Framework: Introduced new NFC provisioning mime-type application/com.android.managedprovisioning.v2" 2015-03-25 16:59:46 +00:00
Alex Klyubin
17badbaf83 am 98ff619d: am d4a2e7c4: am ff022cb1: Merge "Address pending comments for NetworkSecurityPolicy."
* commit '98ff619d79dd213b21e0cb468d6432f0b4e153b4':
  Address pending comments for NetworkSecurityPolicy.
2015-03-25 16:52:44 +00:00
Bryce Lee
a223d65830 am 3309be5e: am 21b7e6de: am c831b978: Merge "Add isScreenBrightnessBoosted and a broadcast when underlying value changes." into lmp-mr1-modular-dev
* commit '3309be5e7bc782d89adaf4abca5f1f81649c655f':
  Add isScreenBrightnessBoosted and a broadcast when underlying value changes.
2015-03-25 16:52:30 +00:00
Alan Viverette
7506f499b5 Merge "Fix to crash when clicking text link without view activity" 2015-03-25 16:35:37 +00:00
Alex Klyubin
d4a2e7c404 am ff022cb1: Merge "Address pending comments for NetworkSecurityPolicy."
* commit 'ff022cb1bd70fc4c9f973af5afebf51517bda572':
  Address pending comments for NetworkSecurityPolicy.
2015-03-25 16:18:50 +00:00
Bryce Lee
21b7e6de94 am c831b978: Merge "Add isScreenBrightnessBoosted and a broadcast when underlying value changes." into lmp-mr1-modular-dev
* commit 'c831b978238d5ed200ca329c540eff00faba77e3':
  Add isScreenBrightnessBoosted and a broadcast when underlying value changes.
2015-03-25 16:09:48 +00:00
Bryce Lee
c831b97823 Merge "Add isScreenBrightnessBoosted and a broadcast when underlying value changes." into lmp-mr1-modular-dev 2015-03-25 16:06:17 +00:00
Zoltan Szatmary-Ban
9c5dfa5c79 Data Usage public API
Added new API consisting of android.app.usage.NetworkUsageManager and
android.app.usage.NetworkUsageStats. Through them data usage on a
network interface can be programmatically queried. Both summary and
details are available.

Bug: 19208876
Change-Id: I0e0c4b37ae23ad1e589d4b0c955b93f28ba4333e
2015-03-25 15:53:38 +00:00
Andrei Kapishnikov
35e71f57b4 Framework: Introduced new NFC provisioning mime-type application/com.android.managedprovisioning.v2
Related CL: https://googleplex-android-review.git.corp.google.com/657588
Bug: 19673809

Change-Id: I292f9a5b5c511c9102fb43fe938b0389af7fbc54
2015-03-25 11:12:01 -04:00
Zoltan Szatmary-Ban
1181ed8a43 Add isActiveAdminWithPolicy to DevicePolicyManagerInternal
This method will be used by other system services to decide whether an
app is a profile owner or device owner.

Change-Id: I9577700d03ce2c80c798a60c6c2f480fd1913f43
2015-03-25 14:40:05 +00:00
Gus Prevas
4e2541c543 am 60b0846f: am c4d7fc10: am 568356ff: Merge "Changes callback to a WeakReference in ActivityContainerCallback." into lmp-mr1-modular-dev
* commit '60b0846fc2be8ba462bcfa535cbaced6c43e532b':
  Changes callback to a WeakReference in ActivityContainerCallback.
2015-03-25 13:16:26 +00:00
Gus Prevas
c4d7fc1021 am 568356ff: Merge "Changes callback to a WeakReference in ActivityContainerCallback." into lmp-mr1-modular-dev
* commit '568356ff9a1deab794d329f8c2e245f5a564a2f3':
  Changes callback to a WeakReference in ActivityContainerCallback.
2015-03-25 13:02:46 +00:00
Florian Salbrechter
084da9b14e Fixed wrong documentation for BLUETOOTH_SERVICE.
The documentation was incorrectly stating that getSystemService() would
return a BluetoothAdater for Context.BLUETOOTH_SERVICE. The actual
return type is BluetoothManager.
2015-03-25 11:00:55 +00:00
Svet Ganov
3784a45225 Merge "First implementation of the grant/revoke UI" 2015-03-25 03:16:40 +00:00
Svet Ganov
3695b8a148 First implementation of the grant/revoke UI
Change-Id: Icdb7c822881552b30850697dba709671bf27baa5
2015-03-24 20:15:43 -07:00
Adam Powell
16e30f5e5f Merge "Fix right click to context menu behavior of View." 2015-03-25 02:26:26 +00:00
Rubin Xu
6fd1705fbc Merge "Fix doc for package checksum in DevicePolicyManager." 2015-03-25 00:41:52 +00:00
Jun Mukai
33e3036a38 Fix right click to context menu behavior of View.
When the View opens the context menu, the mouse-down event is
already handled. Therefore, the next ACTION_UP should be canceled,
otherwise, single right click shows the context menu and then
invokes the normal click actions.

Also, the right-down event should always be consumed regardless
of the context menu support. "the right click opens the context
menu on some views, but it behaves as a normal click on some
other views" would confuse users.

Bug: 19641497
Change-Id: Ibbc18fe641745cf42382129b81858d8f3d14768b
2015-03-24 17:24:10 -07:00
Jim Miller
9f0753f5a3 Refactor fingerprint API
- enroll() and authenticate() now take an explicit callback object.
- better handling of strings
- use framework resources for commonn error strings
- add vendor-specific arrays to resources

Bug 16487912

Change-Id: Idf34242fdd06bba1903cdb22bf20169d15d92b82
2015-03-24 17:02:46 -07:00
Adam Powell
cd9db854dc Merge "Move foreground drawable down from FrameLayout into View" 2015-03-24 23:26:59 +00:00
Adam Powell
2b25e2eee0 Move foreground drawable down from FrameLayout into View
This will allow any View to include foreground drawables. This is
useful for cases where a foreground drawable is a more appropriate
place to put a state list to show focus or touch highlighting.

Also add View#onDrawForeground as a public API hook for drawing
decorations after primary view content and child views such as
scrollbars, foreground drawables and EdgeEffects.

Change-Id: If1e4700af69db6876970f8f4ad5e3eab11b8034c
2015-03-24 16:19:20 -07:00
John Spurlock
221d2cbf2f Merge "Remove the ability to disable audio service." 2015-03-24 22:30:14 +00:00
Gus Prevas
3e7bebf35c Changes callback to a WeakReference in ActivityContainerCallback.
This change prevents the Runnable posted by ActivityContainerCallback
from retaining the ActivityView's callback if it is never cleared out
from ViewRootImpl.sRunQueues.

Bug: 19872883
Bug: 19654978
Change-Id: I6dce4381b96c8c77afcd38a55bfe474f13dfbfba
2015-03-24 17:30:34 -04:00
John Spurlock
b4f01b966b Remove the ability to disable audio service.
Running in a configuration without audio service is not fully tested.
Remove the configuration option for now. Also remove unused delegation
layer in SoundPool.

Bug: 19891112
Change-Id: I47be0e32d54b8ef8fa25cf47b85eacf8a4969500
2015-03-24 17:22:13 -04:00
Dianne Hackborn
6c24a274c8 Merge "More work on device idle mode." 2015-03-24 21:08:29 +00:00
Prerepa Viswanadham
4209a28270 Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge
Change-Id: I49aab437af220f1139cfd2d0a9c362acce31074e
2015-03-24 13:46:08 -07:00
Mady Mellor
a2e207a807 Merge "Text selection - Don't select vertical white space" 2015-03-24 20:16:29 +00:00
Alex Klyubin
84750f3a69 Address pending comments for NetworkSecurityPolicy.
This is a follow-up to
https://android-review.googlesource.com/#/c/131920/, addressing some
outstanding comments.

This CL also switches the source file to the correct indentation.

Bug: 19215516
Change-Id: Ia48455ab351081e11619afcccadb8fa90340391d
2015-03-24 11:33:58 -07:00
Dianne Hackborn
88e98dfa59 More work on device idle mode.
- There is now an API for people to find out about
  its state.
- Moved DeviceIdleController to be closer to the
  power manager implementation, since they are
  closely related.
- Job scheduler now knows about idle state and doesn't
  run jobs while the device is idle.
- Battery stats now keeps track of "idling" vs "idle mode".
  Idling is when we consider the device to be idle,
  independent of whether we are actually in deep idle mode.
  This allows us to keep track of longer-term changes
  independently of cycling in and out of idle mode.
- Battery stats also now keeps track of package changes in
  its daily stats.
- Small optimization to network policy manager service to
  not touch uids that do not have the NETWORK permission.

Change-Id: I0b3304fb3722c78cdfdd0c1eada7369ece7cbcf9
2015-03-24 11:03:49 -07:00
Craig Lafayette
1cef419688 Merge "Add Bluetooth connection extras to DPM." 2015-03-24 12:19:35 +00:00
Rubin Xu
e30ab114b1 Fix doc for package checksum in DevicePolicyManager.
The checksum should be in the URL-safe base64 encoded form.

Bug: 19895519
Change-Id: I84523b796b980fb0ab8825c1ab9245489039564a
2015-03-24 11:22:28 +00:00
Craig Lafayette
97e473e1e1 Add Bluetooth connection extras to DPM.
These extras will be used in ManagedProvisioning to allow
Bluetooth connections from provisioned devices.

Change-Id: I7118acd4ea71e2028a0c9f0c61031c78deef8908
2015-03-24 07:03:23 -04:00
Dmitriy Ivanov
6a225edccd Merge "Load libraries directly from apk" 2015-03-24 02:57:10 +00:00
Svet Ganov
95c1adea0c Add install option to grant all runtime permissions.
Change-Id: I72ba67a72025646a3d53611621b0353d3a86677c
2015-03-24 01:53:50 +00:00
Svetoslav
ca7256ef32 Merge "Runtime permissions: per user permission tracking." 2015-03-24 01:52:11 +00:00
Svetoslav
c6d1c345f4 Runtime permissions: per user permission tracking.
Before all permissions were granted at install time at once, so the user
was persented with an all or nothing choice. In the new runtime permissions
model all dangarous permissions (nomal are always granted and signature
one are granted if signatures match) are not granted at install time and
the app can request them as necessary at runtime.

Before, all granted permission to an app were identical for all users as
granting is performed at install time. However, the new runtime model
allows the same app running under two different users to have different
runtime permission grants. This change refactors the permissions book
keeping in the package manager to enable per user permission tracking.

The change also adds the app facing APIs for requesting runtime permissions.

Change-Id: Icbf2fc2ced15c42ca206c335996206bd1a4a4be5
2015-03-23 18:50:35 -07:00
Christopher Tate
c75517c160 Merge "Back up and restore the set of enabled IMEs" 2015-03-24 01:13:20 +00:00
Griff Hazen
9018354a67 Merge "Merge commit '583c7c56' into master" 2015-03-24 01:12:26 +00:00
Dianne Hackborn
312035232b Merge "Add view ID, rework assist API." 2015-03-24 00:02:38 +00:00