Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
206,194 Commits 3 Branches 0 Tags
b4cb66cdca3a5e179ba6382ac281285adbdeb040
Commit Graph

50559 Commits

Author SHA1 Message Date
Billy Lau
b4cb66cdca am 0e7b3420: am 8b095b1c: am f83e8526: am 5680f9f6: Merge "Bug: 22879202 App compatibility with WRITE_SETTINGS failing" into mnc-dev 
* commit '0e7b34202a18bda1a7848a02f544250f2665ab4d':
  Bug: 22879202 App compatibility with WRITE_SETTINGS failing
 2015-08-03 20:29:15 +00:00
Billy Lau
8b095b1c19 am f83e8526: am 5680f9f6: Merge "Bug: 22879202 App compatibility with WRITE_SETTINGS failing" into mnc-dev 
* commit 'f83e852661e9e42087e48af3010b210474349f33':
  Bug: 22879202 App compatibility with WRITE_SETTINGS failing
 2015-08-03 20:09:09 +00:00
Billy Lau
f83e852661 am 5680f9f6: Merge "Bug: 22879202 App compatibility with WRITE_SETTINGS failing" into mnc-dev 
* commit '5680f9f6d669e7d2f45db1027d53359b9ad327ff':
  Bug: 22879202 App compatibility with WRITE_SETTINGS failing
 2015-08-03 20:00:55 +00:00
Billy Lau
5680f9f6d6 Merge "Bug: 22879202 App compatibility with WRITE_SETTINGS failing" into mnc-dev 2015-08-03 19:53:28 +00:00
Todd Kennedy
e23457741d am 772c6c0d: am 40f0efe0: Merge "Add a trace constant for PackageManager" 
* commit '772c6c0d2d62af7295030ded14b3f428ab325ef4':
  Add a trace constant for PackageManager
 2015-08-03 19:33:07 +00:00
Yusuke Sato
82e7807430 am b98e2353: am 158560ad: Merge "Distinguish user-requested shutdown from power-related ones" 
* commit 'b98e235364c2b221521f622c546733b2862e4677':
  Distinguish user-requested shutdown from power-related ones
 2015-08-03 17:56:37 +00:00
Todd Kennedy
114beb21a0 Add a trace constant for PackageManager 
Change-Id: Ida391be765c63d7b6da3d9fd9d1d975e51b4f3e7
 2015-08-03 09:56:07 -07:00
Ruben Brunk
1055dbe469 am a9b4ed9e: am 20733ba9: am b1286a7a: am 7469060e: Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev 
* commit 'a9b4ed9ee65c3db1975defe1b6bb1afd91cd7ba6':
  Make vendor keys visible in Camera2 java APIs.
 2015-08-03 16:38:17 +00:00
Ruben Brunk
20733ba931 am b1286a7a: am 7469060e: Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev 
* commit 'b1286a7a7202388c307469344e0079c1651fd8d6':
  Make vendor keys visible in Camera2 java APIs.
 2015-08-03 16:22:53 +00:00
Ruben Brunk
b1286a7a72 am 7469060e: Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev 
* commit '7469060e7855ca5b32f66fbad1a0a4f88737c754':
  Make vendor keys visible in Camera2 java APIs.
 2015-08-03 16:16:12 +00:00
Ruben Brunk
7469060e78 Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev 2015-08-03 16:09:07 +00:00
Svetoslav Ganov
9a3d898a58 am 4bdf81a0: am 4f3d5c75: am 1eb06eaa: am 8dbd4848: Merge "Add per UID control to app ops." into mnc-dev 
* commit '4bdf81a07f3279c0477a4d0c565857ab10674974':
  Add per UID control to app ops.
 2015-08-01 17:06:14 +00:00
Dianne Hackborn
2b38a45bf3 am 44ffe9cb: am cba2c596: am 6aa0843e: am fb68b0ad: Merge "Fix issue #21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties" into mnc-dev 
* commit '44ffe9cb33b0ec51d411b7413d222ab251777529':
  Fix issue #21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties
 2015-08-01 17:05:39 +00:00
Alan Viverette
f2fea1363b am dbb79ae9: am 4cf97c91: am 7bfe7b5b: am 5cca30a4: Merge "Revert two changes to LinearLayout measurement" into mnc-dev 
* commit 'dbb79ae9dc457bcb97794f718c6d3aa7fc4a19ca':
  Revert two changes to LinearLayout measurement
 2015-08-01 17:05:28 +00:00
Alan Viverette
ac13014e5f am 41343c0f: am 6550e461: am 0568a230: am 9d8a230f: Revert "View measurement optimization" 
* commit '41343c0f287863488a10a429d88ec094e9183938':
  Revert "View measurement optimization"
 2015-08-01 17:05:22 +00:00
Deepanshu Gupta
a34e65796f am 2535171f: am 92a59d8e: am 92385030: am e836a229: Fix build. 
* commit '2535171fe4898d224101bcce2729904f885b1b7f':
  Fix build.
 2015-08-01 17:05:03 +00:00
Dianne Hackborn
80d0df7cd9 am 62f05dfa: am 55a23950: am e8d3b394: am 692a244b: Fix build. 
* commit '62f05dfa6f3763479d289d747114c34832ab10f6':
  Fix build.
 2015-08-01 17:04:37 +00:00
Dianne Hackborn
628b412584 am bc2a8843: am b97c5ddd: am 9b36f526: am c1836bb0: Merge "Change MNC codename to just M." into mnc-dev 
* commit 'bc2a88431e3dc51e2245cc28e327f11d0c78bd56':
  Change MNC codename to just M.
 2015-08-01 17:04:28 +00:00
Svetoslav Ganov
4f3d5c75e0 am 1eb06eaa: am 8dbd4848: Merge "Add per UID control to app ops." into mnc-dev 
* commit '1eb06eaaef5b56cd71a7cc7e9f5cd5d2b199f420':
  Add per UID control to app ops.
 2015-08-01 16:38:35 +00:00
Dianne Hackborn
cba2c59612 am 6aa0843e: am fb68b0ad: Merge "Fix issue #21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties" into mnc-dev 
* commit '6aa0843ed95d3af828c8dc415053b91f3db25fac':
  Fix issue #21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties
 2015-08-01 16:37:17 +00:00
Alan Viverette
4cf97c915a am 7bfe7b5b: am 5cca30a4: Merge "Revert two changes to LinearLayout measurement" into mnc-dev 
* commit '7bfe7b5b541e3b4585c3ef7eb6d4fb3bd9218df0':
  Revert two changes to LinearLayout measurement
 2015-08-01 16:36:57 +00:00
Alan Viverette
6550e461e5 am 0568a230: am 9d8a230f: Revert "View measurement optimization" 
* commit '0568a230b34f879215e65fbaa79dfa377085bb41':
  Revert "View measurement optimization"
 2015-08-01 16:36:52 +00:00
Deepanshu Gupta
92a59d8ea8 am 92385030: am e836a229: Fix build. 
* commit '923850304a00d337e8bd76000c8ff480df25e7e2':
  Fix build.
 2015-08-01 16:35:31 +00:00
Dianne Hackborn
55a2395004 am e8d3b394: am 692a244b: Fix build. 
* commit 'e8d3b39467e139ae380f2821ab91aad6031f1410':
  Fix build.
 2015-08-01 16:35:02 +00:00
Dianne Hackborn
b97c5ddd2a am 9b36f526: am c1836bb0: Merge "Change MNC codename to just M." into mnc-dev 
* commit '9b36f526dd0378bda8f71c0e51ed37bf97742f8f':
  Change MNC codename to just M.
 2015-08-01 16:34:48 +00:00
Billy Lau
7c19f4cf20 Bug: 22879202 App compatibility with WRITE_SETTINGS failing 
Fix a bug in the app ops protected permission check that broke backwards
compatibility.

Change-Id: Ic73759edd29a479a670fb31407e36aa50d09b6c3
 2015-08-01 13:16:25 +01:00
Svetoslav Ganov
1eb06eaaef am 8dbd4848: Merge "Add per UID control to app ops." into mnc-dev 
* commit '8dbd48485044b1ab25fb8fb5e8e9b9772a3478c4':
  Add per UID control to app ops.
 2015-08-01 02:37:46 +00:00
Svetoslav Ganov
8dbd484850 Merge "Add per UID control to app ops." into mnc-dev 2015-08-01 02:28:02 +00:00
Svet Ganov
2af5708ab0 Add per UID control to app ops. 
The app ops mananger service maintains a mapping from UID to
a list of packages where each package is mapped to a list of
non-default app op states (default states are inferred and
not stored). Hence, specifying the app op state for a UID
requires setting the app op for each package in the shared
UID.

This is problematic when installing new packages if there
is a non-default app op policy set for another already
installed package in the same UID as the app op for the new
package has to be updated to be in sync. The package installer
cannot do this as it is in another process and the app op
update will not be atomic. Therefore, the app ops manager
service has to support specifying app op policy on a per
UID basis.

We now have a UID state object that contains the per package
non-default app op states as well as the per uid non-default
app op states. If there is a UID policy specified then it
takes precedence over the per package one. Even further,
changing the uid policy updates the package policies in this
UID if the state is non-default. Changing a package app op
state also updates the app op state for the whole UID if
the per UID policy for this op is non-default. Clearing the
app op state for a package, clears the policy for the UID
as well.

bug:22802981

Change-Id: I78044906d9fcc6066abf07e706c2c88f3397d293
 2015-07-31 17:45:27 -07:00
Ruben Brunk
c620eb7e86 Make vendor keys visible in Camera2 java APIs. 
- Add vendor keys to getKeys() calls for CameraCharacteristics,
  CaptureRequest, and CaptureResult.
- Vendors can specify whether custom keys show up by listing
  visible keys in the REQUEST_AVAILABLE_RESULT_KEYS field.
- Vendor key types are always treated as a primitive (or Rational)
  array type corresponding to one of the valid types for
  a camera metadata entry.

Bug: 22067625
Change-Id: I6e7dd3db7a8bf533c2ec15ff69ca38824134e971
 2015-07-31 17:14:18 -07:00
Dianne Hackborn
6aa0843ed9 am fb68b0ad: Merge "Fix issue #21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties" into mnc-dev 
* commit 'fb68b0ad344edbba15b961dc444cb24dcfc29995':
  Fix issue #21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties
 2015-07-31 22:36:49 +00:00
Dianne Hackborn
fb68b0ad34 Merge "Fix issue #21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties" into mnc-dev 2015-07-31 22:29:34 +00:00
Alan Viverette
7bfe7b5b54 am 5cca30a4: Merge "Revert two changes to LinearLayout measurement" into mnc-dev 
* commit '5cca30a4ee28a5e70531508d9ad607107adfaa86':
  Revert two changes to LinearLayout measurement
 2015-07-31 21:39:03 +00:00
Alan Viverette
0568a230b3 am 9d8a230f: Revert "View measurement optimization" 
* commit '9d8a230fbd71ac57ef806326f15fa133ba125083':
  Revert "View measurement optimization"
 2015-07-31 21:38:59 +00:00
Alan Viverette
5cca30a4ee Merge "Revert two changes to LinearLayout measurement" into mnc-dev 2015-07-31 21:30:48 +00:00
Dianne Hackborn
afb308d651 Fix issue #21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties 
Change-Id: I928882d42d0546cc6a12e803d96131beaba76d4e
 2015-07-31 13:10:55 -07:00
Alan Viverette
9d8a230fbd Revert "View measurement optimization" 
LinearLayout relied on multiple measurement passes to hide a
discrepancy between EXACTLY and non-EXACTLY measurements.

This reverts commit 9cefbda11e.

Bug: 22810327
Change-Id: I515a80749420d00efc5002fa68221b7c236f03df
 2015-07-31 19:53:02 +00:00
Deepanshu Gupta
923850304a am e836a229: Fix build. 
* commit 'e836a229aefb0ff3b82e19a422590fb7c4bd5148':
  Fix build.
 2015-07-31 19:43:25 +00:00
Dianne Hackborn
e8d3b39467 am 692a244b: Fix build. 
* commit '692a244bffea11157c37c8de93482cb912599b98':
  Fix build.
 2015-07-31 19:42:24 +00:00
Dianne Hackborn
9b36f526dd am c1836bb0: Merge "Change MNC codename to just M." into mnc-dev 
* commit 'c1836bb0f1bf3e5ef0911719525da0bab3e53507':
  Change MNC codename to just M.
 2015-07-31 19:42:11 +00:00
Deepanshu Gupta
e836a229ae Fix build. 
Change-Id: I82295b758e5ceb42e260d3c36ea2310a9def5190
 2015-07-31 12:11:12 -07:00
Dianne Hackborn
692a244bff Fix build. 
Change-Id: Icdf6fa14e53a1c030d0d90205d3bf2d7610b6196
 2015-07-31 10:35:34 -07:00
Dianne Hackborn
c1836bb0f1 Merge "Change MNC codename to just M." into mnc-dev 2015-07-31 17:11:58 +00:00
Alan Viverette
5a969dfd8e Revert two changes to LinearLayout measurement 
"Include non-zero dimension views in excess space calculation" and
"Always distribute excess space in LinearLayout measurement" changed
LinearLayout behavior significantly in a way that wasn't covered by
CTS tests.

This reverts commits da2f304409 and
4fabc02158.

Bug: 22862047
Change-Id: I8d37a525ccf295445d3239b80e5cacb10bf3c947
 2015-07-31 12:42:10 -04:00
Yusuke Sato
705ffd1efe Distinguish user-requested shutdown from power-related ones 
With this patch, when the user requested shutdown,
PowerManagerService sets sys.powerctl is set to
"shutdown,userrequested", and init runs fsck on shutdown.

When shutdown is triggered due to a low power state etc.,
the service sets the property to "shutdown,", and init
immediately shuts down the system without running the
command.

This is a follow-up CL for http://r.android.com/158525.

Bug: 21853106
Change-Id: Iae72990130fe9aa479c802f77301438190dbbfb3
 2015-07-30 23:47:13 -07:00
Lorenzo Colitti
5bbbf8edfd am 3b03916d: am c7a86e90: am c70348c1: am 496a9d26: Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev 
* commit '3b03916de7d1d2c91d5d8c9d1f0f555814a9242f':
  Stop supporting legacy ConnectivityManager routing methods in M.
 2015-07-31 05:43:26 +00:00
Lorenzo Colitti
c7a86e90ea am c70348c1: am 496a9d26: Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev 
* commit 'c70348c194a26176ac54720fe4eabeeb7e4d9993':
  Stop supporting legacy ConnectivityManager routing methods in M.
 2015-07-31 05:31:04 +00:00
Lorenzo Colitti
c70348c194 am 496a9d26: Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev 
* commit '496a9d269b0778ffa1965f3b11d768fe70fd7719':
  Stop supporting legacy ConnectivityManager routing methods in M.
 2015-07-31 05:24:49 +00:00
Lorenzo Colitti
496a9d269b Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev 2015-07-31 05:17:08 +00:00
Dave Langemak
66cff122cc am 2e802cac: am 72dcb47d: am b880a036: am 02565c36: Merge changes from topic \'fix-notification-inflation-2\' into mnc-dev 
* commit '2e802cac1dc036e62d6744d07d0cad56eb37052a':
  Make DateTimeView more robust to weird contexts.
  Make the RemoteViews context safe for Icons.
 2015-07-31 03:18:01 +00:00