Commit Graph

49802 Commits

Author SHA1 Message Date
Jim Miller
d92f643a72 am 748bc36f: Remove "final" qualifier from AuthenticationResult
* commit '748bc36f2eebfdc67520c5025b48fefdfd8d7c01':
  Remove "final" qualifier from AuthenticationResult
2015-07-09 03:34:37 +00:00
Jim Miller
748bc36f2e Remove "final" qualifier from AuthenticationResult
This allows mock implementations to be created for testing
purposes.

Fixes bug 22362080

Change-Id: I5ff002c077d22b1338f2f4e394ad19827bb2ae9c
2015-07-09 03:19:31 +00:00
Adam Lesinski
0d5c30d9ba am 7fb1655a: Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev
* commit '7fb1655a891de275ab8a752294c42b9c13352af6':
  BatteryStats: Fail gracefully on corrupt battery stats
2015-07-09 01:31:21 +00:00
Adam Lesinski
7fb1655a89 Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev 2015-07-09 01:15:15 +00:00
Mady Mellor
809cdd579a am 84005b40: Merge "Use hint text to position handle / floating tool bar popups" into mnc-dev
* commit '84005b40499c0e9cc914afd69570c1f78c92b8d1':
  Use hint text to position handle / floating tool bar popups
2015-07-09 00:43:35 +00:00
Svetoslav
d98e6dc2b0 am 6638c182: Merge "Fix reset permissions on clear data and package uninstall." into mnc-dev
* commit '6638c182635c6af036980ebdacc9c88411dcf583':
  Fix reset permissions on clear data and package uninstall.
2015-07-09 00:43:29 +00:00
Adam Lesinski
9ae9cba020 BatteryStats: Fail gracefully on corrupt battery stats
Bug:22328963
Change-Id: Id0b4c6334706e58483d5fdfd2c1137bfb821c409
2015-07-08 17:35:42 -07:00
Mady Mellor
84005b4049 Merge "Use hint text to position handle / floating tool bar popups" into mnc-dev 2015-07-09 00:06:13 +00:00
Svetoslav
6638c18263 Merge "Fix reset permissions on clear data and package uninstall." into mnc-dev 2015-07-08 23:58:01 +00:00
Svetoslav
4a5f4a2bc7 Fix reset permissions on clear data and package uninstall.
If the user clears data for an app we reset the permission but
only the changes made by the user. We do not modify syste or
policy flags and also ensure the permission that were granted
by default are granted after the data wipe. This is the same
as starting with a clean slate.

If the package whose data is cleared is a part of a shared user
we resent to initial state only the permissions that the cleared
package contributed. Hence, if another package also declared the
permission as used we do not clear the permission state as it is
still in use.

When a package is deleted for a user but still present for another
user we reset its permissions to their inital state follwoing
above described strategy.

Lastly when a preinstalled package wtih an upgrade is diabled
(triggers upgrade uninstall) and this package is a part of a
shared user, we do not drop permission state (grants and flags)
for permissions used by the shadowed system package. This ensures
that we do not drop runtime permission state (such state is
default grants and user changes).i

bug:22248525

Change-Id: I3a3007476d2cb9f4ff824e1e137a6e1a4d04408b
2015-07-08 16:52:42 -07:00
Sasha Levitskiy
319eacbff2 am 12328ef4: Merge "Fingerprint: Add post enroll interface." into mnc-dev
* commit '12328ef422027f2f5f033ed65c8a09535f9ca81d':
  Fingerprint: Add post enroll interface.
2015-07-08 23:07:10 +00:00
Sasha Levitskiy
12328ef422 Merge "Fingerprint: Add post enroll interface." into mnc-dev 2015-07-08 22:59:51 +00:00
Sasha Levitskiy
e0943cf566 Fingerprint: Add post enroll interface.
Bug: 22007124
Change-Id: I9b74edd8e34eaf9ab559b6dc20030a95fa3ce321
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2015-07-08 15:38:07 -07:00
Jeff Sharkey
5d72dfa190 am 9d587a97: Merge changes I9971c466,Ib42474fd into mnc-dev
* commit '9d587a97b9cf89f85d1782a6af66bff487568945':
  Kill MediaProvider during drastic changes.
  Use best volume description for MTP.
2015-07-08 22:01:30 +00:00
Jeff Sharkey
51c94eeedd am c66b90fe: Merge "Generate stable MTP storage IDs." into mnc-dev
* commit 'c66b90fecd06691535157e6b00088de61b51dc41':
  Generate stable MTP storage IDs.
2015-07-08 22:01:22 +00:00
Jeff Sharkey
9d587a97b9 Merge changes I9971c466,Ib42474fd into mnc-dev
* changes:
  Kill MediaProvider during drastic changes.
  Use best volume description for MTP.
2015-07-08 21:55:54 +00:00
Jeff Sharkey
c66b90fecd Merge "Generate stable MTP storage IDs." into mnc-dev 2015-07-08 21:55:15 +00:00
Chien-Yu Chen
ef2dbbbdbd am 3bbcc46d: Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev
* commit '3bbcc46d54f667ec7529a051f1bb9cbfd9f5fed0':
  Camera: Enforce ZERO_SHUTTER_LAG mode
2015-07-08 20:46:56 +00:00
Chien-Yu Chen
3bbcc46d54 Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev 2015-07-08 20:35:00 +00:00
Tingting Wang
d2e88848f4 am 4ccf69e1: Merge "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1." into mnc-dev
* commit '4ccf69e1191244ee104edd74843fc7ae391c5270':
  Don't display Custom for PHONE_TYPE=CUSTOM part 1.
2015-07-08 20:16:52 +00:00
Tingting Wang
4ccf69e119 Merge "Don't display Custom for PHONE_TYPE=CUSTOM part 1." into mnc-dev 2015-07-08 20:07:41 +00:00
Tingting Wang
d55b348e62 Don't display Custom for PHONE_TYPE=CUSTOM part 1.
Dialer sometimes creates custom PHONE_TYPE values without
specifying the custom string. In this case, we shouldn't
display "Custom". We should display nothing.

BUG 21900262

Change-Id: I11aff369c76126a3f60f95aa589ae2a8a3e98bb1
2015-07-08 12:55:22 -07:00
Mady Mellor
ff66ca5038 Use hint text to position handle / floating tool bar popups
In situations where the hint text does not match the direction of
the TextView's primary selection, when you copy text, and long press
in that EditText to paste, the cursor would use the direction of the
hint text to be placed, whereas the handle and floating tool bar
used the TextView's direction to be placed so they wouldn't match.

This CL updates the handle view and floating tool bars to use the
hint text direction when appropriate.

Bug: 21480429
Change-Id: I8090a5b2738c035522c307535ffa165ca024e811
2015-07-08 12:31:45 -07:00
Chien-Yu Chen
72333917a7 Camera: Enforce ZERO_SHUTTER_LAG mode
Camera devices that support YUV or PRIVATE reprocessing must list
ZERO_SHUTTER_LAG mode in android.edge.availableEdgeModes and
android.noiseReduction.availableNoiseReductionModes, and it must
be the default mode for ZSL template.

Bug: 22266686
Change-Id: I4728b2261760d11d695e9e364d8a72b3b2d31284
2015-07-08 11:55:19 -07:00
Jeff Sharkey
a83bf1966e Use best volume description for MTP.
Otherwise we end up showing adopted storage devices as "Unknown."

Bug: 20275423
Change-Id: Ib42474fd5b3284b1e8eca7de8a4cfbb71a34a107
2015-07-08 09:29:24 -07:00
Benjamin Franz
34c562a402 am c088e30f: Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev
* commit 'c088e30fd403b9843a00cc311e460734bd111c26':
  Clarify javadoc of setPermissionPolicy
2015-07-08 14:05:36 +00:00
Benjamin Franz
c088e30fd4 Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev 2015-07-08 13:59:34 +00:00
Benjamin Franz
45dd6667e8 Clarify javadoc of setPermissionPolicy
Bug: 22192363
Change-Id: I552eae1e84ce866d9873faacb5c261321351915a
2015-07-08 14:37:28 +01:00
Zoltan Szatmary-Ban
0e70616cb4 am 89592760: Merge "Expose time-interval detail query on INetworkStatsSession" into mnc-dev
* commit '895927603606e58a46ecaee8f2244e1e2b6f2840':
  Expose time-interval detail query on INetworkStatsSession
2015-07-08 11:44:27 +00:00
Zoltan Szatmary-Ban
8959276036 Merge "Expose time-interval detail query on INetworkStatsSession" into mnc-dev 2015-07-08 11:33:00 +00:00
Neil Fuller
93492e02cc am 26e58f09: am b05c2beb: Merge "Move listen() over to using android.system.Os"
* commit '26e58f09d9c040b8abaa5184a16ec52e5f401b4c':
  Move listen() over to using android.system.Os
2015-07-08 10:50:15 +00:00
Dianne Hackborn
f3fe497f75 am b14dc048: Merge "Add new "preinstalled" permission flag." into mnc-dev
* commit 'b14dc048ec8323e4a10bbfe42129bb91616470b8':
  Add new "preinstalled" permission flag.
2015-07-08 01:07:37 +00:00
Jeff Sharkey
5af1835d67 Generate stable MTP storage IDs.
It ends up that MediaProvider is persisting MTP storage IDs in its
database, so we need to make sure we generate stable IDs over time,
otherwise we can end up looking into a black hole.

Bug: 22256092
Change-Id: I6a75c239aac1b71fd5f6df0df69b24971079a086
2015-07-07 17:46:16 -07:00
Dianne Hackborn
a90c8def2c Add new "preinstalled" permission flag.
This allows you to specify that a permission can be granted to
any pre-installed system app (not just privileged ones).

And as long as I am doing this, clean up the old "system" permission
flag, renaming it to "privileged" which is what it really is today,
deprecating the old names.  And switch the platform's permission
declarations to use the new name.

Change-Id: Iabf484746af232144786851ec7fe90e3de9dddb2
2015-07-07 17:25:25 -07:00
Dianne Hackborn
15f858aada am f2474d33: Merge "Implement better handling of text in assist." into mnc-dev
* commit 'f2474d336a7df696f3897e2cd255d138eb3fac02':
  Implement better handling of text in assist.
2015-07-07 23:57:53 +00:00
Svetoslav
51be65dd12 am 3e07ee07: Merge "Grant installer and verifier install permissions robustly" into mnc-dev
* commit '3e07ee078de8e364d6be0b18b2b514e40decdb3c':
  Grant installer and verifier install permissions robustly
2015-07-07 23:57:37 +00:00
Dianne Hackborn
f2474d336a Merge "Implement better handling of text in assist." into mnc-dev 2015-07-07 23:51:06 +00:00
Jeff Sharkey
922938dfef am 15369c6c: Merge "Fix volume naming when surfaced over MTP." into mnc-dev
* commit '15369c6c3ba50a852ed0c499eb5929436cffa005':
  Fix volume naming when surfaced over MTP.
2015-07-07 23:49:46 +00:00
Dianne Hackborn
6f0fdc4167 Implement better handling of text in assist.
TextView is now much smarter about the text it reports, limiting it
to what is visible (plus a bit more).  Also add a facility for it to
report where the lines of text are, both as offsets in the text string
and their baselines on screen.

Part of fixing issue #22328792: Fix scalability issues in AssistStructure

Change-Id: Idddb8c3a3331355f381e2d4af06d520fe7c7ce8e
2015-07-07 16:47:37 -07:00
Svetoslav
3e07ee078d Merge "Grant installer and verifier install permissions robustly" into mnc-dev 2015-07-07 23:44:34 +00:00
Jeff Sharkey
15369c6c3b Merge "Fix volume naming when surfaced over MTP." into mnc-dev 2015-07-07 23:42:44 +00:00
Alan Viverette
963471f08f am f12c91f5: Merge "Remember focused child during layout when adapter has stable IDs" into mnc-dev
* commit 'f12c91f5e67171bae0d36e89a507c96ff81d04a2':
  Remember focused child during layout when adapter has stable IDs
2015-07-07 23:37:35 +00:00
Alan Viverette
f12c91f5e6 Merge "Remember focused child during layout when adapter has stable IDs" into mnc-dev 2015-07-07 23:26:36 +00:00
Chien-Yu Chen
7ca881549c am 3054f595: Merge "Camera2: implement Key.toString()" into mnc-dev
* commit '3054f595146bbf8c71d4caaf1aad83252d5bcbea':
  Camera2: implement Key.toString()
2015-07-07 22:29:32 +00:00
Chien-Yu Chen
ea01d3b80a am 69421363: Merge "ImageWriter: Exception when Surface is abandoned" into mnc-dev
* commit '69421363c6a81a788b963d2f4cb5fdeaa8bd4200':
  ImageWriter: Exception when Surface is abandoned
2015-07-07 22:29:19 +00:00
Chien-Yu Chen
3054f59514 Merge "Camera2: implement Key.toString()" into mnc-dev 2015-07-07 22:17:08 +00:00
Chien-Yu Chen
69421363c6 Merge "ImageWriter: Exception when Surface is abandoned" into mnc-dev 2015-07-07 22:16:10 +00:00
Eino-Ville Talvala
6dbdb75314 am 384a04d9: Merge "Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement" into mnc-dev
* commit '384a04d93622c764bf1e8a69c288957d78b6a4e4':
  Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement
2015-07-07 21:53:12 +00:00
Jeff Sharkey
7a788a865e Fix volume naming when surfaced over MTP.
Otherwise we show everything as "Unknown."

Bug: 22256092
Change-Id: I19fe8a25aff02db8ca9aff288e6715d469f65327
2015-07-07 14:40:28 -07:00
Eino-Ville Talvala
384a04d936 Merge "Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement" into mnc-dev 2015-07-07 21:36:47 +00:00