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

41006 Commits

Author SHA1 Message Date
John Reck
7c48077877 am a0f5d726: am e182b60c: Merge "Revert "Make starting window hw-accelerated"" into lmp-dev 
* commit 'a0f5d726fc8a5610e41c40e289fd107704202327':
  Revert "Make starting window hw-accelerated"
 2014-09-18 20:57:13 +00:00
Jeff Brown
116e069cdb am 6fc160ed: am d510278d: Merge "Create an Application object for the system process." into lmp-dev 
* commit '6fc160ed30b6d194bbf824c5674403fc622b94f1':
  Create an Application object for the system process.
 2014-09-18 20:57:04 +00:00
Martijn Coenen
bc65b5cbdf am 95bd8257: am 15af6c4e: Merge "Upper-case incoming AIDs." into lmp-dev 
* commit '95bd8257caa7d0cff6dfb06bec6d72361d4f6625':
  Upper-case incoming AIDs.
 2014-09-18 20:56:34 +00:00
John Reck
7e3d6c988c Merge "Revert "Make starting window hw-accelerated"" into lmp-dev 2014-09-18 20:01:15 +00:00
Jeff Brown
2b5f91fe98 Merge "Create an Application object for the system process." into lmp-dev 2014-09-18 19:53:37 +00:00
John Reck
61375a8bb5 Revert "Make starting window hw-accelerated" 
Bug: 17516789

This change corresponds to a sudden influx of bad surface crashes.
Reverting to see if stability returns as this was an optimization
CL

This reverts commit 29ff1bc57ac2c995c56f15ed6e56e5fb247b2a44.

Change-Id: I7835e89017161d94ad05fe46d81bd437c3dae3a7
 2014-09-18 19:29:23 +00:00
Martijn Coenen
da6ffa06b7 Merge "Upper-case incoming AIDs." into lmp-dev 2014-09-18 18:52:57 +00:00
George Mount
4024de450c am 40dc25a2: am b029590f: Merge "Default to using hardware layer during fade transition." into lmp-dev 
* commit '40dc25a250f9f1ab7abcadae2d5e8700898a0e05':
  Default to using hardware layer during fade transition.
 2014-09-18 17:19:41 +00:00
George Mount
48af9ddbb6 Merge "Default to using hardware layer during fade transition." into lmp-dev 2014-09-18 16:56:46 +00:00
Adam Powell
8b69e5685d am 0c5b7311: am 1e2f3d98: Merge "Fix UserManager#isUserAGoat" into lmp-dev 
* commit '0c5b731108dd1842f618e9cc58f07368b731d1dc':
  Fix UserManager#isUserAGoat
 2014-09-18 04:46:12 +00:00
Adam Powell
988ae30ff7 Fix UserManager#isUserAGoat 
Correctly detect if the user is a goat.

Change-Id: I78577dd7ec8c3685434ee03560010a6ea4db127f
 2014-09-17 18:12:13 -07:00
Robert Greenwalt
9231ff23e4 am dbbe65ee: am 50d23752: Merge "Use unified Tethering Permission Check" into lmp-dev 
* commit 'dbbe65ee66eca553054cbdf967808963c9486dfe':
  Use unified Tethering Permission Check
 2014-09-18 00:24:24 +00:00
Robert Greenwalt
f3b47e95b1 Merge "Use unified Tethering Permission Check" into lmp-dev 2014-09-18 00:02:16 +00:00
Robert Greenwalt
edb47668f0 Use unified Tethering Permission Check 
The BT and Wifi mechanisms for enabling Tethering did their own
permission checks.  This set of changes unifies the check into
a ConnectivityManager function so they can be kept in sync.

bug:17435527
Change-Id: I8c157a5acf56ffbddd349cb6a45160ae7be8541b
 2014-09-17 16:18:12 -07:00
George Mount
dc5bf6a7f0 Default to using hardware layer during fade transition. 
Bug 17499864

When hasOverlappingRendering() is true, a layer is used to
to fade views because performance can be much worse then.
When hasOverlappingRendering() is false, the performance
is not hurt and a layer is not used.

Change-Id: If3fb1c23ffc8d0bef85c9d16df6c26ff4bbd49ac
 2014-09-17 15:41:18 -07:00
Jeff Brown
7fc8e357a4 Create an Application object for the system process. 
Change-Id: Icd959fd859a7a556fbcbc519ff8646e1bf95fedc
 2014-09-17 14:19:31 -07:00
Sandeep Siddhartha
67032ce76a am 9364b830: am e80c6f17: Merge "Fix issues with multiple languages and multi-users" into lmp-dev 
* commit '9364b830a4d78a3c76cc7eacc71c9b7808fd414b':
  Fix issues with multiple languages and multi-users
 2014-09-17 20:33:17 +00:00
Sandeep Siddhartha
80ea66b102 Merge "Fix issues with multiple languages and multi-users" into lmp-dev 2014-09-17 20:06:43 +00:00
Jeff Sharkey
c86a48ffb9 am 51420c63: am bfd9a30f: Merge "NetworkStats always needs arrays." into lmp-dev 
* commit '51420c63918de8db44084b04c155448c3fd25362':
  NetworkStats always needs arrays.
 2014-09-17 19:25:08 +00:00
Jeff Sharkey
9d375ecbe6 Merge "NetworkStats always needs arrays." into lmp-dev 2014-09-17 19:01:13 +00:00
Jeff Sharkey
7a8f1a32dc NetworkStats always needs arrays. 
Internal logic relies on Arrays.copyOf(), so always give ourselves
valid arrays, using shared empty objects to save overhead.

Bug: 17502649
Change-Id: I5dbb00545bdfe45bbd48144ab505ea08cc92cbcd
 2014-09-17 09:26:31 -07:00
Robert Greenwalt
a70efa5036 am 8fcbaddd: am d0675e37: Merge "Add NetworkAgent event for ExplicitlySelected" into lmp-dev 
* commit '8fcbaddd331b2b87698bc61c3bef0cdf439c31da':
  Add NetworkAgent event for ExplicitlySelected
 2014-09-17 00:23:08 +00:00
Adrian Roos
571ca37d0f am 3c782941: am 8f4cafc2: Merge "Fix broken dispatch of onApplyWindowInsets" into lmp-dev 
* commit '3c782941ff6b684fe417c5c737e012342a778850':
  Fix broken dispatch of onApplyWindowInsets
 2014-09-17 00:06:21 +00:00
Robert Greenwalt
e7b26be378 Merge "Add NetworkAgent event for ExplicitlySelected" into lmp-dev 2014-09-17 00:06:03 +00:00
Robert Greenwalt
e73cc4646b Add NetworkAgent event for ExplicitlySelected 
Lets Wifi tell us when the user selected this AP vs auto-connected.

bug:17396168
Change-Id: I6e067ab62ed49040629aa31fe07ff880d3d542f0
 2014-09-16 17:03:59 -07:00
Brian Attwell
e3a742f5a0 am 942be889: am 56d143ae: Merge "Pass different dy into dispatchNestedSCroll" into lmp-dev 
* commit '942be889125d2530091f192a8872009580594313':
  Pass different dy into dispatchNestedSCroll
 2014-09-16 23:58:09 +00:00
Alan Viverette
1ebc3fb56b am 36c132a8: am 67798394: Merge "Preserve NPE behavior of removed TextView.getTextColors() API" into lmp-dev 
* commit '36c132a84be88e395e567c66ccc897c6fe628c62':
  Preserve NPE behavior of removed TextView.getTextColors() API
 2014-09-16 23:43:02 +00:00
Alan Viverette
03b51f427f am 17f9b8d6: am 07e867a0: Merge "Fix TimePicker.setCurrentHour() when argument is 0" into lmp-dev 
* commit '17f9b8d6f921dd2c8ce5f265645e63919d9dd474':
  Fix TimePicker.setCurrentHour() when argument is 0
 2014-09-16 23:42:57 +00:00
Alan Viverette
ae1bd20274 am f335590a: am 37cbd74a: Merge "Ensure we always have valid colors in CaptionStyle" into lmp-dev 
* commit 'f335590ac08e1bfa9f38e21c1157c8fc1799a5d9':
  Ensure we always have valid colors in CaptionStyle
 2014-09-16 23:42:51 +00:00
Adrian Roos
543f21da46 Merge "Fix broken dispatch of onApplyWindowInsets" into lmp-dev 2014-09-16 23:42:40 +00:00
Brian Attwell
5665c0f265 Merge "Pass different dy into dispatchNestedSCroll" into lmp-dev 2014-09-16 23:33:24 +00:00
Alan Viverette
af8e823d99 Merge "Preserve NPE behavior of removed TextView.getTextColors() API" into lmp-dev 2014-09-16 23:25:07 +00:00
Alan Viverette
4813482324 Merge "Fix TimePicker.setCurrentHour() when argument is 0" into lmp-dev 2014-09-16 23:23:23 +00:00
Alan Viverette
96f26b8039 Merge "Ensure we always have valid colors in CaptionStyle" into lmp-dev 2014-09-16 23:20:28 +00:00
Robert Greenwalt
390a961720 am ee48c9ef: am c8f6ad36: Merge "Report Network status to NetworkAgent." into lmp-dev 
* commit 'ee48c9ef54a884cd7f2162163252c1bf156a0a2d':
  Report Network status to NetworkAgent.
 2014-09-16 23:14:50 +00:00
Craig Mautner
6e85aada76 am b23fec37: am 880d88b3: Merge "Restore changes that were needed." into lmp-dev 
* commit 'b23fec371a22975abfb5a2951b4cf05d4b7238f2':
  Restore changes that were needed.
 2014-09-16 23:14:46 +00:00
Martijn Coenen
5e991a129c Upper-case incoming AIDs. 
This fixes scenarios where different services
register the same AID in a different case, and
we don't see any conflict.

Bug: 16517161
Change-Id: I610b585ce7d57b4e32c21004a1d4c50e1133986a
 2014-09-16 16:06:45 -07:00
Robert Greenwalt
b4f601cb84 Merge "Report Network status to NetworkAgent." into lmp-dev 2014-09-16 22:59:33 +00:00
Alan Viverette
f1820064d9 Ensure we always have valid colors in CaptionStyle 
BUG: 17521623
Change-Id: I861aa189970fc14dd3e4426e5487a14f373d3a2e
 2014-09-16 15:53:33 -07:00
Craig Mautner
a67d9095b7 Restore changes that were needed. 
Reverting the changes in ag/548487 also reverted alanv's changes
in ag/547793. This restores alanv's changes.

Fixes build.

Change-Id: Ifa2aa928a3ad29fe49e52dbec4e4833538dfe7e9
 2014-09-16 15:50:32 -07:00
Brian Attwell
e0e4217330 Pass different dy into dispatchNestedSCroll 
Bug: 16462679
Bug: 17529919
Change-Id: I328457a27507253cc7bfeab0e2daa4d4563aab17
 2014-09-16 22:48:27 +00:00
Alan Viverette
fe16787bd4 Preserve NPE behavior of removed TextView.getTextColors() API 
BUG: 17511449
Change-Id: Iea7e9aed69c21b230e3c474d4c1378a8663cfcb1
 2014-09-16 15:41:27 -07:00
Craig Mautner
884d31943c am e80f40c5: am b53e4c4a: Merge "Revert "Fix various bugs in DatePickerCalendarDelegate"" into lmp-dev 
* commit 'e80f40c5e86fff5ce075082b8ecbf23ea429f1dd':
  Revert "Fix various bugs in DatePickerCalendarDelegate"
 2014-09-16 22:39:06 +00:00
Craig Mautner
704991224d Merge "Revert "Fix various bugs in DatePickerCalendarDelegate"" into lmp-dev 2014-09-16 22:16:29 +00:00
Craig Mautner
706b3547f8 Revert "Fix various bugs in DatePickerCalendarDelegate" 
alanv@ fixed this yesterday.

This reverts commit 82537efa4c5f4aad12b9aa249fb27eda21647f39.

Change-Id: If2b91ee36f8b24f695200ac1a87a306246ee5e44
 2014-09-16 22:13:39 +00:00
Craig Mautner
3cb639d471 am 48ae7ee3: am 459b2ba5: Merge "Fix various bugs in DatePickerCalendarDelegate" into lmp-dev 
* commit '48ae7ee3f980c811bf0ff8fc9e9797133d9bc3a5':
  Fix various bugs in DatePickerCalendarDelegate
 2014-09-16 21:51:50 +00:00
Amit Mahajan
7c511fee3f am 5807817d: am c5429d6f: Merge "Use Op package name when creating toasts" into lmp-dev 
* commit '5807817d293e705c23fa062db22345323da8d372':
  Use Op package name when creating toasts
 2014-09-16 21:34:59 +00:00
Craig Mautner
f6b4254bef Merge "Fix various bugs in DatePickerCalendarDelegate" into lmp-dev 2014-09-16 21:30:29 +00:00
Adrian Roos
39381948b9 Fix broken dispatch of onApplyWindowInsets 
Fixes an issue where window insets were not further dispatched
if all happen to be zero. To prevent further dispatch, the
insets must now be consumed explicitly.

Bug: 17522145
Change-Id: Ia8f6c10c8369b58db7a7cf49f8bcc2cab8e304f1
 2014-09-16 23:09:33 +02:00
Craig Mautner
9c26b54d3c Fix various bugs in DatePickerCalendarDelegate 
These bugs were exposed by cts DatePickerTest.

Fixes one item in 17459129.

Change-Id: Ifab52c6e6e760b75633aa4fe8ccf2d724f587e09
 2014-09-16 13:57:59 -07:00