drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
213,213 Commits 1 Branch 0 Tags
Commit Graph

213213 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
e0c9dd1b4f Improve error reporting on Exceptions in fw views. 
am: d30c141a2d

* commit 'd30c141a2dee881fd83e1415a50161def1acf227':
  Improve error reporting on Exceptions in fw views.
 2015-11-12 22:36:00 +00:00
Deepanshu Gupta
d30c141a2d Improve error reporting on Exceptions in fw views. 
When there's an exception during the inflation of a framework view (for
example invalid attributes), report the exception correctly. The earlier
behaviour assumed the exception to be a ClassNotFoundException and tried
to load it from the user's project. This is not longer the case.

Also, update the MockView class to a FrameLayout with a single TextView.
This means that the MockView is a ViewGroup and will not choke when
someone attempts to add a View to it (although, the view will be
silently dropped).

Change-Id: Ice003817ceb627ebfbbbb245ab6be10f9141e728
 2015-11-12 13:56:14 -08:00
Chad Brubaker
35e8a31bfa Merge "Support X509TrustManagerExtensions methods" am: b324fb18d9 
am: 8f45b48757

* commit '8f45b487570b5c24eba3b4065f17650e6eb1fd7f':
  Support X509TrustManagerExtensions methods
 2015-11-12 19:43:00 +00:00
Chad Brubaker
cd03475fc4 Merge "Use duck typing in X509TrustManagerExtensions" am: 9c3982f75d 
am: a26cafc2b2

* commit 'a26cafc2b2f072086aba2da0f5651fc9af5e6486':
  Use duck typing in X509TrustManagerExtensions
 2015-11-12 19:41:41 +00:00
Chad Brubaker
8f45b48757 Merge "Support X509TrustManagerExtensions methods" 
am: b324fb18d9

* commit 'b324fb18d916d7037ef7c94a1d54b55d50ffc9c7':
  Support X509TrustManagerExtensions methods
 2015-11-12 19:34:52 +00:00
Chad Brubaker
a26cafc2b2 Merge "Use duck typing in X509TrustManagerExtensions" 
am: 9c3982f75d

* commit '9c3982f75da19e2c0e146e7f251514a44412da0c':
  Use duck typing in X509TrustManagerExtensions
 2015-11-12 19:33:31 +00:00
Chad Brubaker
b324fb18d9 Merge "Support X509TrustManagerExtensions methods" 2015-11-12 19:28:54 +00:00
Chad Brubaker
9c3982f75d Merge "Use duck typing in X509TrustManagerExtensions" 2015-11-12 19:28:21 +00:00
Svetoslav Ganov
af0596d317 Merge "System crash fixed when turn off MagnificationGesture" am: 8f87949340 
am: 1ff9f8ad50

* commit '1ff9f8ad50d9fd7faed901e5fd5e79f0d3a6250e':
  System crash fixed when turn off MagnificationGesture
 2015-11-12 16:09:55 +00:00
Wale Ogunwale
f98a6f4101 Merge "Avoid configuration of callback being reset after relayout." am: cbcafde45e 
am: 0170fb8281

* commit '0170fb8281d4de9364dc51985be26adea3163c0d':
  Avoid configuration of callback being reset after relayout.
 2015-11-12 16:08:34 +00:00
Svetoslav Ganov
1ff9f8ad50 Merge "System crash fixed when turn off MagnificationGesture" 
am: 8f87949340

* commit '8f87949340e858ff4e24615709080978b017f644':
  System crash fixed when turn off MagnificationGesture
 2015-11-12 16:05:07 +00:00
Wale Ogunwale
0170fb8281 Merge "Avoid configuration of callback being reset after relayout." 
am: cbcafde45e

* commit 'cbcafde45ec28d62ce674d215c0264f41580d9a6':
  Avoid configuration of callback being reset after relayout.
 2015-11-12 16:01:22 +00:00
Svetoslav Ganov
8f87949340 Merge "System crash fixed when turn off MagnificationGesture" 2015-11-12 16:00:28 +00:00
Wale Ogunwale
cbcafde45e Merge "Avoid configuration of callback being reset after relayout." 2015-11-12 15:55:18 +00:00
riddle_hsu
164725c652 Avoid configuration of callback being reset after relayout. 
mPendingConfiguration is a parameter of IWindowSession.relayout.
And IWindowSession.aidl declared "out Configuration outConfig",
it will always create a new configuration for remote side to write.
If remote side does not write (WMS does not have config change),
the new default configuration will be returned.

In original code passes mPendingConfiguration to updateConfiguration
directly, then callbacks (sConfigCallbacks) receive the same
instance of mPendingConfiguration. And because the implementation
of callback may use the configuration after relayout has reset
the configuration to default, then it may have timing that results
"showing hybrid of portrait and landscape modes" which try to fix
in commit e36d6e27.

To avoid this, always create a copy to updateConfiguration.
MSG_RESIZED_REPORT from dispatchResized also did the same thing.

Related commit:
e36d6e277e49475076b7872d36ea6a5c5b996e9d
694f79b5d1196640d1beb680b7d1fc68e6e77cbd

Change-Id: Ic1abd596e384918224b3a7020583d9a04641cccc
 2015-11-12 14:07:12 +08:00
Eino-Ville Talvala
184cefc2ae Camera: Documentation updates am: d8407271ff am: 37e78cf8f1 am: 0e57a4d021 
am: 7a062ed396

* commit '7a062ed396f6e563766367de70e0d9c6ba615fed':
  Camera: Documentation updates
 2015-11-12 01:31:30 +00:00
Eino-Ville Talvala
7a062ed396 Camera: Documentation updates am: d8407271ff am: 37e78cf8f1 
am: 0e57a4d021

* commit '0e57a4d02199a55db763b10a49f383c395e768c7':
  Camera: Documentation updates
 2015-11-12 01:25:02 +00:00
Eino-Ville Talvala
0e57a4d021 Camera: Documentation updates am: d8407271ff 
am: 37e78cf8f1

* commit '37e78cf8f18523cda95926a85ae2b3678ffd7e5e':
  Camera: Documentation updates
 2015-11-12 01:18:12 +00:00
Eino-Ville Talvala
37e78cf8f1 Camera: Documentation updates 
am: d8407271ff

* commit 'd8407271ffa83d27e9a524f485a0799e422e1fd6':
  Camera: Documentation updates
 2015-11-12 01:10:07 +00:00
Eino-Ville Talvala
d8407271ff Camera: Documentation updates 
- Clarify hardware.camera feature being only for the back camera
 - Clarify what setting a CaptureRequest field to null does
 - Use preCorrectionActiveArray instead of activeArray in list of
   possible raw output sizes
 - Clarify length of GPS processing field for camera1 API

Bug: 24540625
Bug: 23908116
Bug: 23051627
Bug: 17345901
Change-Id: Iaf11fdf626268cf30f66b3628153ec3ac770c4f4
 2015-11-11 23:59:38 +00:00
Daniel Koulomzin
c549b4fbc4 Merge "ActivityView gets its own thread pool." into cw-e-dev am: 1090acc958 
am: 102e66152a

* commit '102e66152a51e28920da23e2991281f51f2439ee':
  ActivityView gets its own thread pool.
 2015-11-11 23:37:13 +00:00
Daniel Koulomzin
102e66152a Merge "ActivityView gets its own thread pool." into cw-e-dev 
am: 1090acc958

* commit '1090acc958add85c1332fc73b66258ea4efba69e':
  ActivityView gets its own thread pool.
 2015-11-11 23:28:10 +00:00
Daniel Koulomzin
1090acc958 Merge "ActivityView gets its own thread pool." into cw-e-dev 2015-11-11 23:23:18 +00:00
Daniel Koulomzin
71c012e001 ActivityView gets its own thread pool. 
Bug: 24316798

Change-Id: I4278fa792cec8d2710f2f41eed02ba4a14af7052
 2015-11-11 18:21:57 -05:00
Chad Brubaker
93962c2f01 Support X509TrustManagerExtensions methods 
Change-Id: I14a405e90f139b8d73eb9f88597fac804a7c18f3
 2015-11-11 14:35:46 -08:00
Ian Pedowitz
4ab979e6cc Merge "Revert "Fix race condition when setting default ringtones"" into mnc-dr-dev am: 88d4cc1001 am: 4f22c781b6 
am: 44df02fc17

* commit '44df02fc17bb0f3f1c445166c6cbd7f4d92b4eb6':
  Revert "Fix race condition when setting default ringtones"
 2015-11-11 22:04:28 +00:00
Ian Pedowitz
44df02fc17 Merge "Revert "Fix race condition when setting default ringtones"" into mnc-dr-dev am: 88d4cc1001 
am: 4f22c781b6

* commit '4f22c781b614322fe3790d314a527ac10471a63a':
  Revert "Fix race condition when setting default ringtones"
 2015-11-11 21:54:42 +00:00
Ian Pedowitz
4f22c781b6 Merge "Revert "Fix race condition when setting default ringtones"" into mnc-dr-dev 
am: 88d4cc1001

* commit '88d4cc100175a54be3b7d560a91c38197f59f4bf':
  Revert "Fix race condition when setting default ringtones"
 2015-11-11 21:46:06 +00:00
Ian Pedowitz
88d4cc1001 Merge "Revert "Fix race condition when setting default ringtones"" into mnc-dr-dev 2015-11-11 21:39:11 +00:00
Chad Brubaker
bfcd67f71e Use duck typing in X509TrustManagerExtensions 
X509TrustManagerExtensions assumes that the default X509TrustManager is
an instance of conscrypt's TrustManagerImpl. That's no longer going to
always be the case. Instead use duck typing to support any
X509TrustManagers that have the extra methods required for
X509TrustManagerExtensions.

Change-Id: If23471bda590d5e131bb1e802a60599957bc7f37
 2015-11-11 13:38:33 -08:00
Ian Pedowitz
05ce0c6bb0 Revert "Fix race condition when setting default ringtones" 
This reverts commit f2cb9341ff864e6d9cc6797857665b2281643a74.

Change-Id: I151972052aea47bf8c6823eb8bbf8161c5a7a4f0
 2015-11-11 21:38:04 +00:00
Chad Brubaker
70b2eede18 Merge "Add NetworkSecurityConfigProvider" am: d1c469e876 
am: 8c89f4d28c

* commit '8c89f4d28c927ffe81c6e46159d0e5d3a0dd2986':
  Add NetworkSecurityConfigProvider
 2015-11-11 20:39:35 +00:00
Amith Yamasani
f12ffe6d76 Merge "Fix system watchdog timeout when reading too many usage events." am: 10b0bae06f 
am: b3d48f18a9

* commit 'b3d48f18a94c586823462c93fc0f739c83f3db78':
  Fix system watchdog timeout when reading too many usage events.
 2015-11-11 20:38:15 +00:00
Chad Brubaker
8c89f4d28c Merge "Add NetworkSecurityConfigProvider" 
am: d1c469e876

* commit 'd1c469e8769822c48584034076861331fd792a7c':
  Add NetworkSecurityConfigProvider
 2015-11-11 20:32:03 +00:00
Amith Yamasani
b3d48f18a9 Merge "Fix system watchdog timeout when reading too many usage events." 
am: 10b0bae06f

* commit '10b0bae06ffdeb79494ddd1aff19387b56770960':
  Fix system watchdog timeout when reading too many usage events.
 2015-11-11 20:30:32 +00:00
Chad Brubaker
d1c469e876 Merge "Add NetworkSecurityConfigProvider" 2015-11-11 20:25:04 +00:00
Amith Yamasani
10b0bae06f Merge "Fix system watchdog timeout when reading too many usage events." 2015-11-11 20:24:39 +00:00
Chad Brubaker
3210b8b4da Merge "Add support for debug-overrides configuration" am: f1e813ea33 
am: 467804448d

* commit '467804448d6b13e04b4d9bc20fd195baa1f07e90':
  Add support for debug-overrides configuration
 2015-11-11 19:30:01 +00:00
Chad Brubaker
467804448d Merge "Add support for debug-overrides configuration" 
am: f1e813ea33

* commit 'f1e813ea334c947ae0397bfa3a8e42be4fd4ae8c':
  Add support for debug-overrides configuration
 2015-11-11 19:21:32 +00:00
Chad Brubaker
f1e813ea33 Merge "Add support for debug-overrides configuration" 2015-11-11 19:03:30 +00:00
Chad Brubaker
5a1078f40d Add NetworkSecurityConfigProvider 
Change-Id: I321e3ca94cc2a8d5e0e5d82a83b255ff5b8a71d2
 2015-11-11 10:54:54 -08:00
Geoff Mendal
6035d3d256 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: efa66ca345 -s ours 
am: bdc6cd2930  -s ours

* commit 'bdc6cd29303b12ca2fcd8e865f1bb6550b01652f':
  Import translations. DO NOT MERGE
 2015-11-11 18:12:37 +00:00
John Reck
5bb2fdb425 Merge "Fix memory corruption in SpotShadow" am: 8c85c00b5e 
am: 8c8353a8c3

* commit '8c8353a8c3152bc3ee4b74815d64c65c2c9d1991':
  Fix memory corruption in SpotShadow
 2015-11-11 18:08:15 +00:00
Geoff Mendal
bdc6cd2930 Merge "Import translations. DO NOT MERGE" into cw-e-dev 
am: efa66ca345  -s ours

* commit 'efa66ca345bc9c82e9f4c88e4e902f935804ab73':
  Import translations. DO NOT MERGE
 2015-11-11 18:03:38 +00:00
John Reck
8c8353a8c3 Merge "Fix memory corruption in SpotShadow" 
am: 8c85c00b5e

* commit '8c85c00b5e8fffb226f4af225a67425b8d0f190b':
  Fix memory corruption in SpotShadow
 2015-11-11 17:59:16 +00:00
Geoff Mendal
efa66ca345 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-11-11 17:56:56 +00:00
John Reck
8c85c00b5e Merge "Fix memory corruption in SpotShadow" 2015-11-11 17:52:08 +00:00
Geoff Mendal
3c8f7b53da Import translations. DO NOT MERGE am: 984f7fb960 -s ours am: adaccf62be -s ours 
am: d00e9f88d7  -s ours

* commit 'd00e9f88d704c713a313c18a2f5bc37986e7d6e3':
  Import translations. DO NOT MERGE
 2015-11-11 17:49:48 +00:00
Geoff Mendal
d00e9f88d7 Import translations. DO NOT MERGE am: 984f7fb960 -s ours 
am: adaccf62be  -s ours

* commit 'adaccf62be5c8b1f44f5dd0c03bff01a2b314896':
  Import translations. DO NOT MERGE
 2015-11-11 17:41:18 +00:00
Geoff Mendal
ead61cca62 Import translations. DO NOT MERGE 
Change-Id: If1583a01724c6eb81c234b7f2b71c7f276d67a13
Auto-generated-cl: translation import
 2015-11-11 18:41:18 +01:00