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

221219 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
a853bb450c Merge "Early return when the scale is 0." into mnc-dr-dev am: 10eb6ab94b 
am: 8b581e2bc7

* commit '8b581e2bc797d3b470ad7ff3d362a998b42da4ea':
  Early return when the scale is 0.
 2015-11-04 19:40:02 +00:00
Chris Craik
8b581e2bc7 Merge "Early return when the scale is 0." into mnc-dr-dev 
am: 10eb6ab94b

* commit '10eb6ab94b932c33a708e007b0681b26930260e3':
  Early return when the scale is 0.
 2015-11-04 19:33:11 +00:00
Chris Craik
1938c39f77 Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev am: c4aaf0f4b8 
am: 62b16e2e10

* commit '62b16e2e10e488eb69ae0d11d43c7693ad809ec2':
  Remove -ffast-math from libhwui makefile
 2015-11-04 19:33:11 +00:00
Christopher Tate
f2d753ec46 Make WorkSource version of alarm listener API @SystemApi 
WorkSource is not public API but this should be available to
system support modules.

Change-Id: I7283ab8aa5c5e298959d21a5c8fe55ed119bc6a3
 2015-11-04 11:30:52 -08:00
Chris Craik
10eb6ab94b Merge "Early return when the scale is 0." into mnc-dr-dev 2015-11-04 19:28:39 +00:00
Chris Craik
62b16e2e10 Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev 
am: c4aaf0f4b8

* commit 'c4aaf0f4b853e7df1eaffc350618e07474d0bad1':
  Remove -ffast-math from libhwui makefile
 2015-11-04 19:27:19 +00:00
Chris Craik
c4aaf0f4b8 Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev 2015-11-04 19:20:52 +00:00
Christopher Tate
e491d142b2 Fix BlobBackupHelper state tracking 
The disk-friendly use of BufferedInputStream in state parsing was
actually breaking the state management system when multiple helpers
are involved in backup.  The BufferedInputStream would blithely
pre-fetch 8K from the state file -- but that would consume some
state data that the dispatcher and subsequent helpers needed to see
in order to properly evaluate prior state themselves.  The contract
here is that when using the helper mechanism, state-data consumption
must *only* consume as much data as the helper originally stored
into the file.

Switching to a direct-read stream instead fixes the problem by
avoiding read overrun.  The rest of the changes are expanded
debugging output that made diagnosis possible.

Bug 25473872

Change-Id: I91de38dfec96f589700479f41ac26f144ba4463c
 2015-11-04 10:57:37 -08:00
Chong Zhang
d564792383 Merge "Construct ActivityOptions near top level" 2015-11-04 18:56:34 +00:00
Filip Gruszczynski
3958658c71 Merge "Remove blink during the freeform -> recents transition." 2015-11-04 18:55:06 +00:00
Adam Lesinski
b68f9834bd Merge "Use wakeup reason when FingerPrint sensor wakes up the device" 2015-11-04 18:50:27 +00:00
Geoff Mendal
5a317c446b Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 8e7ab07ce7 -s ours am: cbe037b01a -s ours am: c5b905f500 -s ours 
am: 6df893939e  -s ours

* commit '6df893939e765d910748cfd8a42473793919e9f3':
  Import translations. DO NOT MERGE
 2015-11-04 18:44:31 +00:00
John Reck
975a7fa804 Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev am: e22d81debd 
am: 891e52ba29

* commit '891e52ba296a33d0e51befa209c1ce14a2746991':
 2015-11-04 18:43:11 +00:00
John Reck
c4590c4dbd Merge "Revert "Use clang for libhwui"" into mnc-dr-dev am: 1e1fbd804b am: f8635c2e04 am: 26f50df754 
am: 392b0926aa  -s ours

* commit '392b0926aa19ae3856bfddbbeeeb7639f051a86b':
  Revert "Use clang for libhwui"
 2015-11-04 18:41:49 +00:00
Chong Zhang
280d332bd4 Construct ActivityOptions near top level 
This saves some duplicate constructions of the ActivityOptions
object from Bundle.

Bug: 23755120
Change-Id: Ie8be54a2e4e84a6a1f3c51e4f2966f7fb0bf1c28
 2015-11-04 10:41:26 -08:00
Teng-Hui Zhu
cdce35a7e8 Early return when the scale is 0. 
b/24534579

Change-Id: Ib3581ec99387ca70ca036026f64857a49657d94b
(cherry picked from commit 8d0ec389531d071529fb0a800f10733b057205d9)
 2015-11-04 18:31:50 +00:00
Geoff Mendal
c0d1bab7bd Import translations. DO NOT MERGE am: 4c9cdbc7ba -s ours am: d4d6fdefdf -s ours am: 7c941cd30c -s ours 
am: 68b7d59f3e  -s ours

* commit '68b7d59f3e278fb18ec6f2631f60341df40b0abc':
  Import translations. DO NOT MERGE
 2015-11-04 18:28:47 +00:00
Geoff Mendal
6df893939e Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 8e7ab07ce7 -s ours am: cbe037b01a -s ours 
am: c5b905f500  -s ours

* commit 'c5b905f50069233c2769352a0614605b3ad348f8':
  Import translations. DO NOT MERGE
 2015-11-04 18:24:14 +00:00
John Reck
891e52ba29 Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev 
am: e22d81debd

* commit 'e22d81debd8f2ac9432f42e4c1908da4400a1a29':
 2015-11-04 18:22:58 +00:00
John Reck
392b0926aa Merge "Revert "Use clang for libhwui"" into mnc-dr-dev am: 1e1fbd804b am: f8635c2e04 
am: 26f50df754

* commit '26f50df75477a18e40c6da59a15cc2bd4b441239':
  Revert "Use clang for libhwui"
 2015-11-04 18:21:35 +00:00
Geoff Mendal
68b7d59f3e Import translations. DO NOT MERGE am: 4c9cdbc7ba -s ours am: d4d6fdefdf -s ours 
am: 7c941cd30c  -s ours

* commit '7c941cd30c9c958c4776126f9f16b343f1f10ff3':
  Import translations. DO NOT MERGE
 2015-11-04 18:19:40 +00:00
Chris Craik
e02ec7c37a Remove -ffast-math from libhwui makefile 
bug:25417885

Change-Id: I8244bd28c2d46fc449398b9bf5104bf7cbaded8a
 2015-11-04 10:14:57 -08:00
Geoff Mendal
c5b905f500 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 8e7ab07ce7 -s ours 
am: cbe037b01a  -s ours

* commit 'cbe037b01ab25dfbab1cb6ea0fa137787e747ab7':
  Import translations. DO NOT MERGE
 2015-11-04 18:12:19 +00:00
John Reck
e22d81debd Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev 2015-11-04 18:11:21 +00:00
John Reck
26f50df754 Merge "Revert "Use clang for libhwui"" into mnc-dr-dev am: 1e1fbd804b 
am: f8635c2e04

* commit 'f8635c2e043b6466f65cc0159a8f4021701d2165':
  Revert "Use clang for libhwui"
 2015-11-04 18:10:52 +00:00
John Reck
632d26d1b0 Merge "Revert "Use clang for libhwui"" into mnc-dr-dev am: 1e1fbd804b 
am: f8635c2e04

* commit 'f8635c2e043b6466f65cc0159a8f4021701d2165':
  Revert "Use clang for libhwui"
 2015-11-04 18:09:49 +00:00
Geoff Mendal
7c941cd30c Import translations. DO NOT MERGE am: 4c9cdbc7ba -s ours 
am: d4d6fdefdf  -s ours

* commit 'd4d6fdefdf83018e46e8de56f0e1679954bb398a':
  Import translations. DO NOT MERGE
 2015-11-04 18:08:13 +00:00
Geoff Mendal
cbe037b01a Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
am: 8e7ab07ce7  -s ours

* commit '8e7ab07ce76c20da653e098adfe38da867753305':
  Import translations. DO NOT MERGE
 2015-11-04 18:00:48 +00:00
John Reck
f8635c2e04 Merge "Revert "Use clang for libhwui"" into mnc-dr-dev 
am: 1e1fbd804b

* commit '1e1fbd804b71419736eac4bf537f0a454687b209':
  Revert "Use clang for libhwui"
 2015-11-04 17:59:15 +00:00
Geoff Mendal
d4d6fdefdf Import translations. DO NOT MERGE 
am: 4c9cdbc7ba  -s ours

* commit '4c9cdbc7ba72d6dc09e0f2bacbf8641c764045ca':
  Import translations. DO NOT MERGE
 2015-11-04 17:57:51 +00:00
Filip Gruszczynski
14b4e57c1b Remove blink during the freeform -> recents transition. 
We achieve the desired result by prolonging the last frame of the
animation until recents tells that it drew its content. The CL also
includes cleanup that moves code that depends heavily on WindowState
fields into that class.

Bug: 24913782
Change-Id: I5ee5b18504dd4a86c24033d17eca21cd31936bca
 2015-11-04 09:53:22 -08:00
Geoff Mendal
8e7ab07ce7 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-11-04 17:47:45 +00:00
Geoff Mendal
c406898e8c Merge "Import translations. DO NOT MERGE" 2015-11-04 17:47:04 +00:00
Geoff Mendal
f8f111fc2c Import translations. DO NOT MERGE 
Change-Id: Icad182fa5b410d93f43fcba49a0d07cefed7970c
Auto-generated-cl: translation import
 2015-11-04 11:40:21 -06:00
John Reck
967bb181c1 Merge "Fix GCC build" 2015-11-04 17:24:07 +00:00
Geoff Mendal
ec580cac44 Import translations. DO NOT MERGE 
Change-Id: I84475a6361421bfbe49288943a14f1c8996a7801
Auto-generated-cl: translation import
 2015-11-04 11:16:22 -06:00
Clara Bayarri
f7fea166d4 Intercept activity start with ConfirmCredentials 
When the calling user is a work profile and the device has
file based encryption enabled, show the work challenge via the
Confirm Credentials APIs before launching the requested activity.

A companion CL in Settings will add support to the Confirm
Credentials flow to read the given intent extra and fire it when
the authorization succeeds.

This is part of the Separate Work Challenge feature.
Note nobody will see this yet as the feature is conditioned by
file based encryption.

Change-Id: I303890095936b1fd1f6a99d645724dffba144345
 2015-11-04 16:46:41 +00:00
Clara Bayarri
243336b3f9 Merge "Create a File Based Encryption check API" 2015-11-04 16:35:51 +00:00
Glenn Kasten
1857aca9eb Merge "Built-in mic is not used when USB mic is disconnected" am: ebbdabdb82 am: 1104180301 
am: d1323e9b70

* commit 'd1323e9b70f94796491cad4132982fd4664395b0':
  Built-in mic is not used when USB mic is disconnected
 2015-11-04 16:27:58 +00:00
John Reck
1e1fbd804b Merge "Revert "Use clang for libhwui"" into mnc-dr-dev 2015-11-04 16:24:02 +00:00
Glenn Kasten
d1323e9b70 Merge "Built-in mic is not used when USB mic is disconnected" am: ebbdabdb82 
am: 1104180301

* commit '110418030167702f29fa686616d68fc62f9c0995':
  Built-in mic is not used when USB mic is disconnected
 2015-11-04 16:19:36 +00:00
Glenn Kasten
1104180301 Merge "Built-in mic is not used when USB mic is disconnected" 
am: ebbdabdb82

* commit 'ebbdabdb826c083769e7d7bc102a59a04c9e0329':
  Built-in mic is not used when USB mic is disconnected
 2015-11-04 16:10:44 +00:00
Glenn Kasten
ebbdabdb82 Merge "Built-in mic is not used when USB mic is disconnected" 2015-11-04 16:03:41 +00:00
Alejandro Ochoa
46b434ff98 Built-in mic is not used when USB mic is disconnected 
In some cases when the USB microphone is disconnected,
audio stack does not switch to the built-in microphone.
It gets stuck in a state where it still recognizes the
USB mic is still connected. Current device removal
implementation only considers USB output devices such
as headset. The same process should be used for input
USB devices (microphone).

Bug: 24932354
Change-Id: Ic2089ef5a9a318cb47336ade405f79eccd7129f8
Signed-off-by: Alejandro Ochoa <alejandro.ochoa@intel.com>
 2015-11-04 15:58:09 +00:00
John Reck
c90ed759cf Fix GCC build 
Change-Id: I990993b8b751bdaf41ce4db1aa7e28823f296777
 2015-11-04 07:39:44 -08:00
Alan Viverette
0a1a5e3781 Merge "Reduce CascadingMenuPopup's reliance on internal ListView state" 2015-11-04 15:22:58 +00:00
John Reck
492a56cc93 Revert "Use clang for libhwui" 
Bug 25462107

This reverts commit d354fd2c66855d116440eb4c936317f124241225.

Change-Id: Ib7c50b5becf247f837f3cc20f9128d9411d22563
 2015-11-04 15:21:35 +00:00
Alan Viverette
78a8df4919 Merge "Always call legacy performLongClick()" 2015-11-04 15:09:27 +00:00
Geoff Mendal
25a28b0ec4 Merge "Import translations. DO NOT MERGE" 2015-11-04 15:03:47 +00:00
Geoff Mendal
4c9cdbc7ba Import translations. DO NOT MERGE 
Change-Id: I4d14bf278e491e46eeaabd4bb97641d06c48920c
Auto-generated-cl: translation import
 2015-11-04 06:59:32 -08:00