Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
195,775 Commits 3 Branches 0 Tags
08e14da78d96929a458bb0e23817d3fb04462c27
Commit Graph

48475 Commits

Author SHA1 Message Date
Dianne Hackborn
08e14da78d am a597200a: am 54d803c0: am dd5ee4b8: Merge "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"" into mnc-dev 
* commit 'a597200a60a8b2ab63498700a0b7b0a9ea948c93':
  Revert "resolved conflicts for merge of 47249f2a to mnc-dev"
 2015-05-23 01:09:15 +00:00
Dianne Hackborn
a597200a60 am 54d803c0: am dd5ee4b8: Merge "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"" into mnc-dev 
* commit '54d803c0274137998c7dbb9d7b8af58de13be5b6':
  Revert "resolved conflicts for merge of 47249f2a to mnc-dev"
 2015-05-23 00:58:27 +00:00
Simranjit Singh Kohli
94083dacd9 am be134e31: am c2e945ba: am aefdaa5c: Merge "[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]" into mnc-dev 
* commit 'be134e31008bb8017f683f553cefeef16fab86dd':
  [ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]
 2015-05-23 00:57:51 +00:00
Simranjit Singh Kohli
be134e3100 am c2e945ba: am aefdaa5c: Merge "[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]" into mnc-dev 
* commit 'c2e945ba37ecb09c640de88abbcc60f5ad76efb8':
  [ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]
 2015-05-23 00:44:24 +00:00
Amith Yamasani
2c38ca0443 am fa41be53: am 031f1bc9: am 7870550a: Merge "Add getPermissionGrantState method in device policy" into mnc-dev 
* commit 'fa41be53ee9f6c9209f71c0b652df45db49f8ae8':
  Add getPermissionGrantState method in device policy
 2015-05-23 00:39:36 +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
Amith Yamasani
fa41be53ee am 031f1bc9: am 7870550a: Merge "Add getPermissionGrantState method in device policy" into mnc-dev 
* commit '031f1bc9ee6d79591e4bf2c4c30d616e87fc6f6b':
  Add getPermissionGrantState method in device policy
 2015-05-23 00:26:32 +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
Yin-Chia Yeh
89617b1cdc am 7247c6d1: am 5c4def8a: am 5cf9d8ac: Merge "Camera: update available LSC map mode key type" into mnc-dev 
* commit '7247c6d10ffa741bbe2ddc115326d8c4f4e98adc':
  Camera: update available LSC map mode key type
 2015-05-23 00:09:31 +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
7247c6d10f am 5c4def8a: am 5cf9d8ac: Merge "Camera: update available LSC map mode key type" into mnc-dev 
* commit '5c4def8acda8124da2637a590bcf4ee0cd2ecd3c':
  Camera: update available LSC map mode key type
 2015-05-22 23:55:12 +00: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
Yin-Chia Yeh
e3919e6a6f am bf1bc14d: am d310d94f: am 9fbdc874: Merge "Camera2: update FpsRange requirement" into mnc-dev 
* commit 'bf1bc14d4c92f40d5aa9b9ba0b30e43e2d0a723c':
  Camera2: update FpsRange requirement
 2015-05-22 22:29:27 +00:00
Yin-Chia Yeh
bf1bc14d4c am d310d94f: am 9fbdc874: Merge "Camera2: update FpsRange requirement" into mnc-dev 
* commit 'd310d94f77fcb2da8057cfd948cb2f453a1f2398':
  Camera2: update FpsRange requirement
 2015-05-22 22:10:29 +00:00
Adam Powell
45dc1fc691 am aa66b15a: am 369e6074: am 94518a4c: Merge "Restore app expectations around drawable visibility change timing" into mnc-dev 
* commit 'aa66b15a43d4089d1b3e0b26383558815bb8d9ce':
  Restore app expectations around drawable visibility change timing
 2015-05-22 21:42:46 +00:00
Dianne Hackborn
a8ce9e8363 am 271e92c1: am da517da8: am fa4d547d: Merge "Improve reporting to apps of transaction too large failures." into mnc-dev 
* commit '271e92c1975da9cd6e1a062db1221f9004b9ea86':
  Improve reporting to apps of transaction too large failures.
 2015-05-22 21:42:19 +00:00
Chien-Yu Chen
cdd306f807 am 5fd20f21: am 6c474a7e: am f5b1e39c: Merge "Camera2: Implement toString() for camera2 params" into mnc-dev 
* commit '5fd20f21315ddc8cf2ad20f85e990e742189880d':
  Camera2: Implement toString() for camera2 params
 2015-05-22 21:41:36 +00:00
Chris Craik
25b2cc5b8a am f6576379: am 36dd6e63: am 33416a93: Merge "Disable density scaling for HW canvas" into mnc-dev 
* commit 'f6576379331d670f3a548e9db8e904827e9de5b0':
  Disable density scaling for HW canvas
 2015-05-22 21:41:01 +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
aa66b15a43 am 369e6074: am 94518a4c: Merge "Restore app expectations around drawable visibility change timing" into mnc-dev 
* commit '369e607472bd7341f2407cddee3a0079da862e2d':
  Restore app expectations around drawable visibility change timing
 2015-05-22 20:17:15 +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
271e92c197 am da517da8: am fa4d547d: Merge "Improve reporting to apps of transaction too large failures." into mnc-dev 
* commit 'da517da8d9292cf12465545528ad6e11bbc79d0a':
  Improve reporting to apps of transaction too large failures.
 2015-05-22 19:17:36 +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
Chien-Yu Chen
5fd20f2131 am 6c474a7e: am f5b1e39c: Merge "Camera2: Implement toString() for camera2 params" into mnc-dev 
* commit '6c474a7e915dad90d0c4f76c6bbc50f40020b506':
  Camera2: Implement toString() for camera2 params
 2015-05-22 18:32:43 +00:00
Stuart Scott
94b038bbb2 Network Reset should have a lockdown like Factory Reset. 
bug:20332322
Change-Id: I7c61a011d11e89513757f112abf320bb2a785edb
 2015-05-22 11:29:28 -07: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
Chris Craik
f657637933 am 36dd6e63: am 33416a93: Merge "Disable density scaling for HW canvas" into mnc-dev 
* commit '36dd6e63fe520666272af1f9784adc4a450112e3':
  Disable density scaling for HW canvas
 2015-05-22 18:20:09 +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
33416a9363 Merge "Disable density scaling for HW canvas" into mnc-dev 2015-05-22 17:57:08 +00:00
Chris Craik
9c08ee0f6c Disable density scaling for HW canvas 
bug:20692121

Change-Id: Ief4514ba55857e183fa281f28e5aceac08d51990
 2015-05-22 10:49:48 -07:00
Chien-Yu Chen
310f381eac Camera2: Implement toString() for camera2 params 
Implement toString() for BlackLevelPattern, InputConfiguration, and
StreamConfigurationMap.

Bug: 16899576
Change-Id: Ide1cf103f3282750653ce7bdc29c0b74920d4855
 2015-05-22 10:40:21 -07:00
Fyodor Kupolov
aa590a788b am 5fbbd954: am 13b61b29: am 96616a57: Merge "Use factory methods for RestrictionEntry" into mnc-dev 
* commit '5fbbd954544f950ab0805bb2d248d44b1c06bdcb':
  Use factory methods for RestrictionEntry
 2015-05-22 16:52:51 +00:00
Clara Bayarri
4b07507465 am 28c5ef5f: am 6b9f24ca: am ae0940fe: Merge "Update the PROCESS_TEXT action javadoc to include types" into mnc-dev 
* commit '28c5ef5fa13dd00a5fc46478f57325f2e9c41cfd':
  Update the PROCESS_TEXT action javadoc to include types
 2015-05-22 16:52:27 +00:00
Erik Kline
437a9398c2 am 00e53ba8: am eb7e4048: am 2dcba49c: Merge "Notify only on loss of provisioning." into mnc-dev 
* commit '00e53ba869ad45a7b7088131bfa6fa15369bfe63':
  Notify only on loss of provisioning.
 2015-05-22 16:52:21 +00:00
Keisuke Kuroyanagi
81df2aa26d am b5329008: am 3e7965f7: am 1733bd3d: Merge "Fix: Insertion handle can be moved just by tapping." into mnc-dev 
* commit 'b53290085ad044bfe7e24e08a1ef6c636913cc24':
  Fix: Insertion handle can be moved just by tapping.
 2015-05-22 16:52:16 +00:00
Fyodor Kupolov
5fbbd95454 am 13b61b29: am 96616a57: Merge "Use factory methods for RestrictionEntry" into mnc-dev 
* commit '13b61b293d89545b193f40535b8f10f10a5fb191':
  Use factory methods for RestrictionEntry
 2015-05-22 16:46:07 +00:00
Clara Bayarri
28c5ef5fa1 am 6b9f24ca: am ae0940fe: Merge "Update the PROCESS_TEXT action javadoc to include types" into mnc-dev 
* commit '6b9f24caff303c11953ff1f9417cbff2e91bdb55':
  Update the PROCESS_TEXT action javadoc to include types
 2015-05-22 16:38:52 +00:00
Erik Kline
00e53ba869 am eb7e4048: am 2dcba49c: Merge "Notify only on loss of provisioning." into mnc-dev 
* commit 'eb7e4048d319cd65c1d927abd10a8637c39ff5fb':
  Notify only on loss of provisioning.
 2015-05-22 16:38:46 +00:00
Keisuke Kuroyanagi
b53290085a am 3e7965f7: am 1733bd3d: Merge "Fix: Insertion handle can be moved just by tapping." into mnc-dev 
* commit '3e7965f71c1ab5c89034deed85c093d8a5843a92':
  Fix: Insertion handle can be moved just by tapping.
 2015-05-22 16:38:41 +00:00
Fyodor Kupolov
96616a57f3 Merge "Use factory methods for RestrictionEntry" into mnc-dev 2015-05-22 16:21:20 +00:00
Clara Bayarri
ae0940fe75 Merge "Update the PROCESS_TEXT action javadoc to include types" into mnc-dev 2015-05-22 10:24:57 +00:00
Erik Kline
2dcba49caf Merge "Notify only on loss of provisioning." into mnc-dev 2015-05-22 04:22:04 +00:00
Erik Kline
b1eebaeb92 Notify only on loss of provisioning. 
Lots of code refactoring, include:
    - no longer watch for on-link proxies (only routers and DNS servers)
    - keep track of NUD state of neighbors of interest

Bug: 18581716
Change-Id: Ia7dbef0690daf54f69ffecefc14e1224fd402397
 2015-05-22 13:03:08 +09:00
Keisuke Kuroyanagi
1733bd3def Merge "Fix: Insertion handle can be moved just by tapping." into mnc-dev 2015-05-22 02:28:26 +00:00
Dianne Hackborn
2d2e2e0cef am ad15bee4: am c60f010e: am 8b20cdb2: Merge "Add API to track usage time of apps." into mnc-dev 
* commit 'ad15bee4ff4ead176d4e4fb06c7b579db9cf3cfa':
  Add API to track usage time of apps.
 2015-05-22 01:50:16 +00:00