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

48080 Commits

Author SHA1 Message Date
Nicolas Prevot
7b8e8691d4 am 5e0ef0d0: Merge "Say in the doc that DISALLOW_CONFIG_VPN now works." into mnc-dev 
* commit '5e0ef0d0e62b77bcfc687bfbc1db875db71eba69':
  Say in the doc that DISALLOW_CONFIG_VPN now works.
 2015-05-26 20:51:43 +00:00
Nicolas Prevot
5e0ef0d0e6 Merge "Say in the doc that DISALLOW_CONFIG_VPN now works." into mnc-dev 2015-05-26 20:39:28 +00:00
John Spurlock
82a0c9b363 am 12e0b390: Merge "Zen: Calendar auto-rule tracks primary calendar for corp profile." into mnc-dev 
* commit '12e0b390efd2fb8c21a2700be9dcd95d15b31ba6':
  Zen: Calendar auto-rule tracks primary calendar for corp profile.
 2015-05-26 19:49:50 +00:00
John Spurlock
12e0b390ef Merge "Zen: Calendar auto-rule tracks primary calendar for corp profile." into mnc-dev 2015-05-26 19:41:53 +00:00
John Spurlock
1b8b22b1a4 Zen: Calendar auto-rule tracks primary calendar for corp profile. 
- Track the calendar provider for the managed profile user if found.
 - Add userId to the shared data structure to disambig calendar ids.
 - Delay rule update a bit to guard against chatty updates.
 - Fix logging in calendar rule.

Bug: 21155107
Change-Id: Id2303fcc39b1fa7417b1844b7869d773ef92434c
 2015-05-26 15:39:05 -04:00
Paul Jensen
4813e789c0 am 46ed04de: Merge "Add javadoc comments mentioning ConnectivityManager API permissions." into mnc-dev 
* commit '46ed04de082b18137d879161802fd8512a70e9d4':
  Add javadoc comments mentioning ConnectivityManager API permissions.
 2015-05-26 17:47:46 +00:00
Paul Jensen
46ed04de08 Merge "Add javadoc comments mentioning ConnectivityManager API permissions." into mnc-dev 2015-05-26 17:37:33 +00:00
Alan Viverette
73cd5f159c am 75a857ce: Merge "Handle error states when refreshing accessibility node" into mnc-dev 
* commit '75a857cec5f3500954a76f251e81535378ba293a':
  Handle error states when refreshing accessibility node
 2015-05-26 17:33:16 +00:00
Jean-Michel Trivi
62be952893 am dfe318d7: Merge "Ringtone picker is not affected by current sonification policy" into mnc-dev 
* commit 'dfe318d7120b8a1299dda957ad84d29171b583fb':
  Ringtone picker is not affected by current sonification policy
 2015-05-26 17:33:11 +00:00
Alan Viverette
75a857cec5 Merge "Handle error states when refreshing accessibility node" into mnc-dev 2015-05-26 17:29:39 +00:00
Jean-Michel Trivi
dfe318d712 Merge "Ringtone picker is not affected by current sonification policy" into mnc-dev 2015-05-26 17:27:07 +00:00
Chet Haase
9bd850c098 am 1ddc95eb: Merge "Clarify example for Deep Share" into mnc-dev 
* commit '1ddc95ebb244660244681558d16325771ca56b3c':
  Clarify example for Deep Share
 2015-05-26 17:26:08 +00:00
Chet Haase
1ddc95ebb2 Merge "Clarify example for Deep Share" into mnc-dev 2015-05-26 17:15:59 +00:00
Jason Monk
c63b34a0b3 am 16224288: Merge "Add constants for permissions granted status api" into mnc-dev 
* commit '16224288791dd3f122931504e624637fdcc70903':
  Add constants for permissions granted status api
 2015-05-26 16:45:10 +00:00
Jason Monk
1622428879 Merge "Add constants for permissions granted status api" into mnc-dev 2015-05-26 16:32:57 +00:00
dcashman
4f86ac545e am b7b7b5ec: Merge "Set error code on failed keyset manifest parsing." into mnc-dev 
* commit 'b7b7b5ece86e32a7e5636d0c41c3dee373e8ac5a':
  Set error code on failed keyset manifest parsing.
 2015-05-26 15:04:55 +00:00
dcashman
b7b7b5ece8 Merge "Set error code on failed keyset manifest parsing." into mnc-dev 2015-05-26 14:57:27 +00:00
Jason Monk
9cfa0cc51e Add constants for permissions granted status api 
Bug: 21078474
Change-Id: I6b0bcf0c11258ae263eb08366c14f9298798afdb
 2015-05-26 10:26:18 -04:00
Selim Cinek
7957a3331c am 912696e7: Merge "Fixed logspam and handling subwindows with the input consumer" into mnc-dev 
* commit '912696e79785ad26bb2f27354bedce1739f311e3':
  Fixed logspam and handling subwindows with the input consumer
 2015-05-26 07:41:06 +00:00
Selim Cinek
912696e797 Merge "Fixed logspam and handling subwindows with the input consumer" into mnc-dev 2015-05-26 07:34:18 +00:00
Chet Haase
fd98809873 Clarify example for Deep Share 
Changed name of service to avoid using the actual class name
ChooserTargetService as the example service's name.

Issue #21418354 Clarify doc example for ChooserTargetService

Change-Id: I59bf67299fe7a8307504baf5e999c14f84a1e50d
 2015-05-25 08:47:36 -07:00
Svet Ganov
62e609eeb7 am a7590243: Merge "Hide pakcage installer system APIs." into mnc-dev 
* commit 'a75902439403966b9308d38fcf5e51c20e43a583':
  Hide pakcage installer system APIs.
 2015-05-23 20:43:39 +00:00
Svet Ganov
a759024394 Merge "Hide pakcage installer system APIs." into mnc-dev 2015-05-23 20:31:55 +00:00
Svet Ganov
0b316706b1 Hide pakcage installer system APIs. 
Change-Id: If5245ed2be7a3ebb50a7af924be85894314f6f47
 2015-05-23 13:25:11 -07:00
Selim Cinek
d6623618b2 Fixed logspam and handling subwindows with the input consumer 
Bug: 21402648
Change-Id: I4c1c73487dfd19ba452ff2077d8541547f149c3b
 2015-05-23 01:57:41 +00:00
Dianne Hackborn
9f61a3c56b am dd5ee4b8: Merge "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"" into mnc-dev 
* commit 'dd5ee4b89083ec9b50b8c9739274136b0c74abb5':
  Revert "resolved conflicts for merge of 47249f2a to mnc-dev"
 2015-05-23 00:45:25 +00:00
Dianne Hackborn
dd5ee4b890 Merge "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"" into mnc-dev 2015-05-23 00:34:35 +00:00
Simranjit Singh Kohli
1fc89f0c66 am aefdaa5c: Merge "[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]" into mnc-dev 
* commit 'aefdaa5cbd2a68aa6c8e7d229b897237562cebcb':
  [ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]
 2015-05-23 00:33:10 +00:00
Simranjit Singh Kohli
aefdaa5cbd Merge "[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]" into mnc-dev 2015-05-23 00:20:40 +00:00
Simranjit Singh Kohli
734f8fb69d [ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes] 
Fixing lots of bugs related to the ChooseAccount Activities.
1. Fix jank which is seen when no accounts are present on the device.
2. After addition of the account, return to the user.
3. Don't crash when the user provides null to allowableAccountTypes.
4. Updated documentation of AccountManager#newChooseAccountIntent.
5. Fix NPE.

Bug: 13104800
Bug: 17926560
Bug: 9626001

Change-Id: I0d1913e46560cfb458526a7c930a38049602d8f1
 2015-05-22 17:19:21 -07:00
Amith Yamasani
bbc1724c56 am 7870550a: Merge "Add getPermissionGrantState method in device policy" into mnc-dev 
* commit '7870550a1b6e1110bf461633970e439d0243a868':
  Add getPermissionGrantState method in device policy
 2015-05-23 00:13:46 +00:00
Amith Yamasani
7870550a1b Merge "Add getPermissionGrantState method in device policy" into mnc-dev 2015-05-23 00:05:47 +00:00
Yin-Chia Yeh
930c47429a am 5cf9d8ac: Merge "Camera: update available LSC map mode key type" into mnc-dev 
* commit '5cf9d8ac94f4a3e00ef32c382950a9cd5e8fd4a7':
  Camera: update available LSC map mode key type
 2015-05-22 23:48:13 +00:00
Nicolas Prevot
298f98fa23 Say in the doc that DISALLOW_CONFIG_VPN now works. 
BUG:18902920
Change-Id: I761cba1f1e01fbe88f773887bf4e9233fc85cfef
 2015-05-22 16:43:03 -07:00
Yin-Chia Yeh
5cf9d8ac94 Merge "Camera: update available LSC map mode key type" into mnc-dev 2015-05-22 23:40:33 +00:00
Yin-Chia Yeh
656931d36d Camera: update available LSC map mode key type 
Bug: 21403373
Change-Id: I37101e2d0ef5cb8d66676dcdb16938ac8fe85c64
 2015-05-22 16:37:27 -07:00
Dianne Hackborn
4bb6b751fb Revert "resolved conflicts for merge of 47249f2a to mnc-dev" 
This reverts commit c7becb7ee7, reversing
changes made to 8562b08f04.
 2015-05-22 16:34:44 -07:00
dcashman
5db0cd49e8 Set error code on failed keyset manifest parsing. 
Bug: 21403585
Change-Id: I6f8e0766d373b1b0451b2abef7af6cbb089e4e0c
 2015-05-22 15:52:43 -07:00
Yin-Chia Yeh
9a582ad990 am 9fbdc874: Merge "Camera2: update FpsRange requirement" into mnc-dev 
* commit '9fbdc87422efe54f075ce8c40d460a3a56449ed6':
  Camera2: update FpsRange requirement
 2015-05-22 21:11:05 +00:00
Yin-Chia Yeh
9fbdc87422 Merge "Camera2: update FpsRange requirement" into mnc-dev 2015-05-22 20:57:08 +00:00
Amith Yamasani
184b3753de Add getPermissionGrantState method in device policy 
This is to have a way to query what permission state was set by
the profile owner.

Bug: 21356830
Change-Id: Ie396e946b4285267c1d95f82b9d9765b43697d3c
 2015-05-22 13:55:57 -07:00
Yin-Chia Yeh
5855162f80 Camera2: update FpsRange requirement 
Codegen doc update only.

Bug:13639914
Change-Id: Id8a4a237c409725831a65b4f134422cd261cad52
 2015-05-22 13:50:10 -07:00
Adam Powell
79691ac498 am 94518a4c: Merge "Restore app expectations around drawable visibility change timing" into mnc-dev 
* commit '94518a4c35801fb0b4c0c8bdf2975225fce14d78':
  Restore app expectations around drawable visibility change timing
 2015-05-22 20:04:01 +00:00
Adam Powell
94518a4c35 Merge "Restore app expectations around drawable visibility change timing" into mnc-dev 2015-05-22 19:48:54 +00:00
Dianne Hackborn
dc9cd47c58 am fa4d547d: Merge "Improve reporting to apps of transaction too large failures." into mnc-dev 
* commit 'fa4d547d5813a8f5c298efd089890b5b502df76d':
  Improve reporting to apps of transaction too large failures.
 2015-05-22 19:03:57 +00:00
Dianne Hackborn
fa4d547d58 Merge "Improve reporting to apps of transaction too large failures." into mnc-dev 2015-05-22 18:52:41 +00:00
Adam Powell
eb2b0af22c Restore app expectations around drawable visibility change timing 
When we update drawable visibility has changed to be part of
View.onVisibilityChanged instead of an overload of
setVisibility. While this covers more cases that we were previously
missing, it also means that we now set drawable visibility from the
View constructor via the call chain view.setFlags to
view.onVisibilityChanged to drawable.setVisibility, resulting in us
passing a 'this' pointer all over before the object is fully
initialized. (i.e. a Bad Thing.)

In general we've gotten away with playing fast and loose with this
sort of thing as a part of view inflation - calling various non-final
setters that may invoke callbacks as needed rather than initializing
view fields directly. Unfortunately it also means that we can cause a
lot of hard to trace bugs and in the long run we should try to clean
up as much of it as we can.

In this case, some apps were expecting inflation to have finished
completely before any drawable visibility changed. If a view's
visibility changes but it's not attached to a window, does it make a
callback?

The fix: no. We won't dispatch onVisibilityChanged to detached views,
but we will dispatch it when a view becomes attached.

Also fix a bug where we could end up telling a view its visibility
changed to (INVISIBLE | GONE), which just doesn't make any sense.

Bug 20103422

Change-Id: Ifba54c36114e85cf64869afcca766c30d601a16c
 2015-05-22 11:21:17 -07:00
Chien-Yu Chen
a54ca62a1e am f5b1e39c: Merge "Camera2: Implement toString() for camera2 params" into mnc-dev 
* commit 'f5b1e39c2e47a09e5df7d1cfbf05abcca0d429c9':
  Camera2: Implement toString() for camera2 params
 2015-05-22 18:19:58 +00:00
Chien-Yu Chen
f5b1e39c2e Merge "Camera2: Implement toString() for camera2 params" into mnc-dev 2015-05-22 18:15:05 +00:00
Chris Craik
0b9c3abbe3 am 33416a93: Merge "Disable density scaling for HW canvas" into mnc-dev 
* commit '33416a9363a8d78bf10818d40806085a4d1ba311':
  Disable density scaling for HW canvas
 2015-05-22 18:07:14 +00:00