Commit Graph

49675 Commits

Author SHA1 Message Date
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
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
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
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
72dcb47d94 am b880a036: am 02565c36: Merge changes from topic \'fix-notification-inflation-2\' into mnc-dev
* commit 'b880a036b12c8a8613fbd7fb41328ca93146bf85':
  Make DateTimeView more robust to weird contexts.
  Make the RemoteViews context safe for Icons.
2015-07-31 03:04:26 +00:00
Dave Langemak
b880a036b1 am 02565c36: Merge changes from topic \'fix-notification-inflation-2\' into mnc-dev
* commit '02565c3622aa9007d3d5eb4612f200decd05b55c':
  Make DateTimeView more robust to weird contexts.
  Make the RemoteViews context safe for Icons.
2015-07-31 02:57:24 +00:00
Dave Langemak
02565c3622 Merge changes from topic 'fix-notification-inflation-2' into mnc-dev
* changes:
  Make DateTimeView more robust to weird contexts.
  Make the RemoteViews context safe for Icons.
2015-07-31 02:52:30 +00:00
Dan Sandler
4b67713709 Make DateTimeView more robust to weird contexts.
In particular, some clients (*ahem* SystemUI) have been
known to inflate RemoteViews with unusual derived contexts
that may not have valid application contexts. DateTimeView
can now resist this.

Bug: 22852700
Change-Id: I5e91ae0e66859f5f5efd7b19c0ae6dfbc26bcc54
2015-07-30 22:33:12 -04:00
Dan Sandler
706274f7ff Make the RemoteViews context safe for Icons.
Icon needs the RemoteViews' internal context to reflect not
just the Resources of the originating application, but its
package name as well.

Bug: 22840771
Bug: 22852700
Change-Id: I1164cd38d99283982b00daadcf927c7cf63539b3
2015-07-30 22:32:54 -04:00
Lorenzo Colitti
ffc42b0b7b Stop supporting legacy ConnectivityManager routing methods in M.
The methods startUsingNetworkFeature, stopUsingNetworkFeature and
requestRouteToHost were @removed in all the M preview builds, but
internal and external developers have noted that this imposes
additional burden for applications that need to work across
multiple platform versions because it causes compile-time errors.

We switched from @removed back to @deprecated to avoid these
problems. In order to effectively deprecate these methods, which
are error-prone and insecure, make them throw
UnsupportedOperationException if the app's target SDK is M or
above.

Because there are still one or two places in system code that use
these APIs, exempt Process.SYSTEM_UID and the OMA-DM client from
the check for now.

Bug: 22728205
Change-Id: I790bd32f3aa8067cbb625962a209bb9232f4b58c
2015-07-31 11:08:27 +09:00
Adam Lesinski
eec946aacd am ee6046ad: am 00f7cb92: Merge "BatteryStats: include mobile radio active count and unknown time in checkin" into mnc-dev
* commit 'ee6046add136d4791e71fb17a07076b425b7250c':
  BatteryStats: include mobile radio active count and unknown time in checkin
2015-07-31 00:05:22 +00:00
Adam Lesinski
ee6046add1 am 00f7cb92: Merge "BatteryStats: include mobile radio active count and unknown time in checkin" into mnc-dev
* commit '00f7cb924e6964c5403c55ae5e7348aad1c8ec7b':
  BatteryStats: include mobile radio active count and unknown time in checkin
2015-07-30 23:58:30 +00:00
Adam Lesinski
00f7cb924e Merge "BatteryStats: include mobile radio active count and unknown time in checkin" into mnc-dev 2015-07-30 23:50:27 +00:00
Adam Lesinski
782327bde7 BatteryStats: include mobile radio active count and unknown time in checkin
These are important values to help diagnose modem related wakeup issues.

Bug:22803686
Bug:22857991
Change-Id: Ie0164ebd194567bc10d1165d671a583674a39829
2015-07-30 23:50:10 +00:00
Carlos Valdivia
f725a702aa am e195d179: am 26ae600b: Merge "Permissions: GET_ACCOUNTS permission cleanup" into mnc-dev
* commit 'e195d179490754bc9358afe8ba74ecc38aed2360':
  Permissions: GET_ACCOUNTS permission cleanup
2015-07-30 22:13:08 +00:00
Carlos Valdivia
e195d17949 am 26ae600b: Merge "Permissions: GET_ACCOUNTS permission cleanup" into mnc-dev
* commit '26ae600b5fb8c657b4f8dc2700374c701c9e50ec':
  Permissions: GET_ACCOUNTS permission cleanup
2015-07-30 22:07:31 +00:00
Carlos Valdivia
26ae600b5f Merge "Permissions: GET_ACCOUNTS permission cleanup" into mnc-dev 2015-07-30 21:58:16 +00:00
Simranjit Kohli
b6af87ca90 am e5bf7064: am 964a4121: Merge "[Improve docs for AccountManager] Currently, the docs for AccountManager are somewhat misleading and may cause developer errors. To avoid them, we are properly documenting it." into mnc-dev
* commit 'e5bf70649499b3d3404d5df156ad38f106ce158a':
  [Improve docs for AccountManager] Currently, the docs for AccountManager are somewhat misleading and may cause developer errors. To avoid them, we are properly documenting it.
2015-07-30 17:24:43 +00:00
Alan Viverette
82c14e6865 am 92360585: am 559daf7a: Merge "Include non-zero dimension views in excess space calculation" into mnc-dev
* commit '92360585abfb96736f5b55b5410425eb4ad7669c':
  Include non-zero dimension views in excess space calculation
2015-07-30 17:18:44 +00:00
Simranjit Kohli
e5bf706494 am 964a4121: Merge "[Improve docs for AccountManager] Currently, the docs for AccountManager are somewhat misleading and may cause developer errors. To avoid them, we are properly documenting it." into mnc-dev
* commit '964a41214d19f00e8420500ccaa29e0902933c7e':
  [Improve docs for AccountManager] Currently, the docs for AccountManager are somewhat misleading and may cause developer errors. To avoid them, we are properly documenting it.
2015-07-30 17:17:49 +00:00
Alan Viverette
92360585ab am 559daf7a: Merge "Include non-zero dimension views in excess space calculation" into mnc-dev
* commit '559daf7a749514065c6c482503a86a528addc985':
  Include non-zero dimension views in excess space calculation
2015-07-30 17:11:58 +00:00
Simranjit Kohli
964a41214d Merge "[Improve docs for AccountManager] Currently, the docs for AccountManager are somewhat misleading and may cause developer errors. To avoid them, we are properly documenting it." into mnc-dev 2015-07-30 17:09:44 +00:00
Alan Viverette
559daf7a74 Merge "Include non-zero dimension views in excess space calculation" into mnc-dev 2015-07-30 17:02:45 +00:00