Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
205,914 Commits 3 Branches 0 Tags
7bd71f65417e0fa643d59abd3c3bdebb9cc992f2
Commit Graph

50689 Commits

Author SHA1 Message Date
Svetoslav
7bd71f6541 am 122350fc: am 843d7216: am 353835e1: am c88dec32: am 6638c182: Merge "Fix reset permissions on clear data and package uninstall." into mnc-dev 
* commit '122350fca781048e0a59260e2bed233b428cf3fd':
  Fix reset permissions on clear data and package uninstall.
 2015-07-09 01:33:34 +00:00
Svetoslav
122350fca7 am 843d7216: am 353835e1: am c88dec32: am 6638c182: Merge "Fix reset permissions on clear data and package uninstall." into mnc-dev 
* commit '843d721647bf39f4f819b9decc090a9196c1f706':
  Fix reset permissions on clear data and package uninstall.
 2015-07-09 01:14:44 +00:00
Filip Gruszczynski
d5efc98af6 am 93c4f915: am c72a5821: am 886fd2f5: am b010291a: Fix NPE when requesting outsets for detached view. 
* commit '93c4f915945eb788a19ec6e25b0f1e3dfe9abd53':
  Fix NPE when requesting outsets for detached view.
 2015-07-09 00:58:31 +00:00
Svetoslav
353835e12d am c88dec32: am 6638c182: Merge "Fix reset permissions on clear data and package uninstall." into mnc-dev 
* commit 'c88dec321b666092735263dbb247c56e45186abf':
  Fix reset permissions on clear data and package uninstall.
 2015-07-09 00:47:20 +00:00
Filip Gruszczynski
93c4f91594 am c72a5821: am 886fd2f5: am b010291a: Fix NPE when requesting outsets for detached view. 
* commit 'c72a582138c1db297c662e5f83ce6a2e97f8bf69':
  Fix NPE when requesting outsets for detached view.
 2015-07-09 00:45:37 +00:00
Filip Gruszczynski
886fd2f5a0 am b010291a: Fix NPE when requesting outsets for detached view. 
* commit 'b010291ace13947fcc76b1a64eaa67880e15f0a6':
  Fix NPE when requesting outsets for detached view.
 2015-07-09 00:15:25 +00:00
Sasha Levitskiy
a6ec86af3e am 6889cc64: am 70407ff4: am 1022fa9a: am ce3da983: am 12328ef4: Merge "Fingerprint: Add post enroll interface." into mnc-dev 
* commit '6889cc64cd2c92fd7263e54bdf0c4b4a8710bd9d':
  Fingerprint: Add post enroll interface.
 2015-07-09 00:08:05 +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
Sasha Levitskiy
6889cc64cd am 70407ff4: am 1022fa9a: am ce3da983: am 12328ef4: Merge "Fingerprint: Add post enroll interface." into mnc-dev 
* commit '70407ff418d54cbcd62f59334c258f4781994b20':
  Fingerprint: Add post enroll interface.
 2015-07-08 23:53:20 +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
Filip Gruszczynski
b010291ace Fix NPE when requesting outsets for detached view. 
Outsets are used during measure/layout pass, but this can be called on a
view that is not currently attached.

Bug: 21602590
Change-Id: I23e3acc45ca4bf7684d8913f839e29e8e9e94d78
(cherry picked from commit e660d4e96a)
 2015-07-08 23:22:36 +00:00
Jeff Sharkey
333b5b7d34 am b64813bd: am 093be69c: am f3d73162: am 46552cff: am 9d587a97: Merge changes I9971c466,Ib42474fd into mnc-dev 
* commit 'b64813bdf08502ded55f7222ea426c7c948cc4e9':
  Kill MediaProvider during drastic changes.
  Use best volume description for MTP.
 2015-07-08 23:00:02 +00:00
Jeff Sharkey
28e38bbf44 am 608114f9: am e232afca: am 95661575: am 612aac4e: am c66b90fe: Merge "Generate stable MTP storage IDs." into mnc-dev 
* commit '608114f9668be847715a7e8015bda19e4343b535':
  Generate stable MTP storage IDs.
 2015-07-08 22:59:55 +00:00
Sasha Levitskiy
12328ef422 Merge "Fingerprint: Add post enroll interface." into mnc-dev 2015-07-08 22:59:51 +00:00
Jeff Sharkey
b64813bdf0 am 093be69c: am f3d73162: am 46552cff: am 9d587a97: Merge changes I9971c466,Ib42474fd into mnc-dev 
* commit '093be69c4168988938d276d31625515f641a170b':
  Kill MediaProvider during drastic changes.
  Use best volume description for MTP.
 2015-07-08 22:44:24 +00:00
Jeff Sharkey
608114f966 am e232afca: am 95661575: am 612aac4e: am c66b90fe: Merge "Generate stable MTP storage IDs." into mnc-dev 
* commit 'e232afca8240e3b8bbbd9696a210aed5b14b9b79':
  Generate stable MTP storage IDs.
 2015-07-08 22:44:19 +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
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
d5623bea0d am 361d5203: am c8984961: am 73d7cfea: am be0a7a0d: am 3bbcc46d: Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev 
* commit '361d5203db93f39c717eac95c4504db44b5aaf21':
  Camera: Enforce ZERO_SHUTTER_LAG mode
 2015-07-08 21:45:31 +00:00
Chien-Yu Chen
361d5203db am c8984961: am 73d7cfea: am be0a7a0d: am 3bbcc46d: Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev 
* commit 'c8984961604cdcf0e2744d461e08c32bdf6918ab':
  Camera: Enforce ZERO_SHUTTER_LAG mode
 2015-07-08 21:31:34 +00:00
Tingting Wang
7150e1a9e2 am b8fb1343: am 79f44602: am eeb5b9d0: am 0f4595af: am 4ccf69e1: Merge "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1." into mnc-dev 
* commit 'b8fb1343c35fd2d31434357f46c244336ac1d5f1':
  Don't display Custom for PHONE_TYPE=CUSTOM part 1.
 2015-07-08 21:18:40 +00:00
Tingting Wang
b8fb1343c3 am 79f44602: am eeb5b9d0: am 0f4595af: am 4ccf69e1: Merge "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1." into mnc-dev 
* commit '79f44602a4cae17f262b024c9349c04d8dbcc5cf':
  Don't display Custom for PHONE_TYPE=CUSTOM part 1.
 2015-07-08 21:02:21 +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
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
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
54b09b3494 am 5a9102e3: am 12ceccaf: am 4b7d3b47: am 051762f7: am c088e30f: Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev 
* commit '5a9102e307f395dec106cd5e0109abf9b0e07d5b':
  Clarify javadoc of setPermissionPolicy
 2015-07-08 15:17:12 +00:00
Benjamin Franz
5a9102e307 am 12ceccaf: am 4b7d3b47: am 051762f7: am c088e30f: Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev 
* commit '12ceccaf7aa4198bb578bcba844729c0ac146d6d':
  Clarify javadoc of setPermissionPolicy
 2015-07-08 14:47:52 +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
9a4c5f2782 am 55a3a233: am 5bc85aa8: am d426cf73: am 30871415: am 89592760: Merge "Expose time-interval detail query on INetworkStatsSession" into mnc-dev 
* commit '55a3a23307ba1591b95941f7c487c931da505ce0':
  Expose time-interval detail query on INetworkStatsSession
 2015-07-08 13:10:13 +00:00
Zoltan Szatmary-Ban
55a3a23307 am 5bc85aa8: am d426cf73: am 30871415: am 89592760: Merge "Expose time-interval detail query on INetworkStatsSession" into mnc-dev 
* commit '5bc85aa8dbfdf03a5e764e74c415189c1bfa591c':
  Expose time-interval detail query on INetworkStatsSession
 2015-07-08 12:55:18 +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
a02e3c7ed7 am 849558b7: am 26e58f09: am b05c2beb: Merge "Move listen() over to using android.system.Os" 
* commit '849558b72711e57a06fa4df2d6c5a2294df5d49e':
  Move listen() over to using android.system.Os
 2015-07-08 11:05:13 +00:00
Neil Fuller
849558b727 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:36 +00:00
Dianne Hackborn
ee94484303 am 7b3add61: am f368f6b9: am 6ee8a509: am c55c4a28: am b14dc048: Merge "Add new "preinstalled" permission flag." into mnc-dev 
* commit '7b3add61c9e47b708725147dffc23d396db37add':
  Add new "preinstalled" permission flag.
 2015-07-08 02:17:58 +00:00
Dianne Hackborn
1699ba48ce am 88936b7f: am a719be69: am 15e35270: am 5e449276: am f2474d33: Merge "Implement better handling of text in assist." into mnc-dev 
* commit '88936b7f82a6ec4023078e62304425147da4b56e':
  Implement better handling of text in assist.
 2015-07-08 02:05:44 +00:00
Svetoslav
4e5dac3d6e am 3fd5ebfd: am 7cc8de60: am 0ce19f8e: am 240f8e5f: am 3e07ee07: Merge "Grant installer and verifier install permissions robustly" into mnc-dev 
* commit '3fd5ebfd778e540276fb5205a8ba3185e620647d':
  Grant installer and verifier install permissions robustly
 2015-07-08 02:05:26 +00:00
Jeff Sharkey
a4da90dbab am 28339797: am 6e77499a: am fb10a760: am 79204a32: am 15369c6c: Merge "Fix volume naming when surfaced over MTP." into mnc-dev 
* commit '28339797043834e5f1cd196363ef3cfdd66607ad':
  Fix volume naming when surfaced over MTP.
 2015-07-08 02:05:19 +00:00
Alan Viverette
b6bd296f60 am 6dcbc0a5: am 382fe3b8: am 292a1564: am 407630e7: am f12c91f5: Merge "Remember focused child during layout when adapter has stable IDs" into mnc-dev 
* commit '6dcbc0a578100b0484c199e64be251cbb5212330':
  Remember focused child during layout when adapter has stable IDs
 2015-07-08 02:04:57 +00:00
Chien-Yu Chen
2748e8c8d5 am 392b917e: am 61430694: am 843236b6: am abd68058: am 3054f595: Merge "Camera2: implement Key.toString()" into mnc-dev 
* commit '392b917e1b25e1a1a8dfe3ec054058e82ded56ce':
  Camera2: implement Key.toString()
 2015-07-08 02:04:11 +00:00
Chien-Yu Chen
b07de6d418 am 32ade1ab: am 1ae0a7d3: am dd21689b: am cceb8268: am 69421363: Merge "ImageWriter: Exception when Surface is abandoned" into mnc-dev 
* commit '32ade1ab7b7a3ca11a586abda99b3f9a8b5b8ec8':
  ImageWriter: Exception when Surface is abandoned
 2015-07-08 02:03:55 +00:00
Eino-Ville Talvala
810bc8d335 am af72d92b: am 314877b8: am 2915f3c6: am 26dfd03d: am 384a04d9: Merge "Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement" into mnc-dev 
* commit 'af72d92bf124697dd2f4528a730806c56bff503d':
  Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement
 2015-07-08 02:03:35 +00:00
Alan Viverette
b2cc376e8c am 75f4278d: am 3c254aba: am 90433ee7: am e89c65fb: am 8830db0a: Merge "Never fully detach header or footer views in AbsListView" into mnc-dev 
* commit '75f4278d73d701191ad82cb0e3b5566feff8d873':
  Never fully detach header or footer views in AbsListView
 2015-07-08 02:03:18 +00:00
Aravind Akella
5baa0e4a35 am f606595c: am 5444b6be: am 1656c024: am 2ea6c646: am c5889757: Merge "Clean up get sensorList." into mnc-dev 
* commit 'f606595c7697060663b234dc31fbf2cb79419ed5':
  Clean up get sensorList.
 2015-07-08 02:02:29 +00:00
Dianne Hackborn
7b3add61c9 am f368f6b9: am 6ee8a509: am c55c4a28: am b14dc048: Merge "Add new "preinstalled" permission flag." into mnc-dev 
* commit 'f368f6b9786f5a62561845744d601a20148716b4':
  Add new "preinstalled" permission flag.
 2015-07-08 02:01:38 +00:00
Dianne Hackborn
88936b7f82 am a719be69: am 15e35270: am 5e449276: am f2474d33: Merge "Implement better handling of text in assist." into mnc-dev 
* commit 'a719be69b1e0c8c6723457a51673f5dab8f9f819':
  Implement better handling of text in assist.
 2015-07-08 01:39:53 +00:00
Svetoslav
3fd5ebfd77 am 7cc8de60: am 0ce19f8e: am 240f8e5f: am 3e07ee07: Merge "Grant installer and verifier install permissions robustly" into mnc-dev 
* commit '7cc8de60682b1ed22be1b452809b36a5ceaae02a':
  Grant installer and verifier install permissions robustly
 2015-07-08 01:39:40 +00:00