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

213127 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Geoff Mendal
8e7ab07ce7 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-11-04 17:47:45 +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
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
492a56cc93 Revert "Use clang for libhwui" 
Bug 25462107

This reverts commit d354fd2c66855d116440eb4c936317f124241225.

Change-Id: Ib7c50b5becf247f837f3cc20f9128d9411d22563
 2015-11-04 15:21:35 +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
Diego Perez
7cdbfaf459 Merge "Remove auto-boxing during the inflate" into mnc-ub-dev 
am: 1c442aca0a

* commit '1c442aca0a1b054e3aa0a40ba89c08b39099be2f':
  Remove auto-boxing during the inflate
 2015-11-04 14:35:39 +00:00
Diego Perez
724af9ce6f Merge "Update StaticLayout_Delegate to use new nLoadHyphenator" into mnc-ub-dev 
am: 7dda46e740

* commit '7dda46e740250d753bb9d01e129e91695ab8cfe2':
  Update StaticLayout_Delegate to use new nLoadHyphenator
 2015-11-04 14:34:19 +00:00
Geoff Mendal
9a4b6b9094 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 931082b728 -s ours 
am: b67481b336  -s ours

* commit 'b67481b336d211c6d96e2110e865b55f615fd9df':
  Import translations. DO NOT MERGE
 2015-11-04 14:27:19 +00:00
Diego Perez
1c442aca0a Merge "Remove auto-boxing during the inflate" into mnc-ub-dev 2015-11-04 14:26:15 +00:00
Diego Perez
7dda46e740 Merge "Update StaticLayout_Delegate to use new nLoadHyphenator" into mnc-ub-dev 2015-11-04 14:25:58 +00:00
Geoff Mendal
f587cfec79 Import translations. DO NOT MERGE am: f44adbba69 -s ours 
am: 5bf5deb84c  -s ours

* commit '5bf5deb84cdc61aa27ea12695ee20cc308e45184':
  Import translations. DO NOT MERGE
 2015-11-04 14:25:55 +00:00
Geoff Mendal
b67481b336 Merge "Import translations. DO NOT MERGE" into cw-e-dev 
am: 931082b728  -s ours

* commit '931082b728a42e0b22b163721d7d48faf23d45a4':
  Import translations. DO NOT MERGE
 2015-11-04 14:09:51 +00:00
Geoff Mendal
5bf5deb84c Import translations. DO NOT MERGE 
am: f44adbba69  -s ours

* commit 'f44adbba69c22e4c9cd681bbb3cab70097eae118':
  Import translations. DO NOT MERGE
 2015-11-04 14:08:19 +00:00
Geoff Mendal
931082b728 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-11-04 13:38:21 +00:00
Geoff Mendal
3b2a1141cb Import translations. DO NOT MERGE 
Change-Id: I7c47fb535cfa65f435efe21fd59118039b6359f5
Auto-generated-cl: translation import
 2015-11-04 07:20:46 -06:00
Geoff Mendal
f44adbba69 Import translations. DO NOT MERGE 
Change-Id: I52024255e1324f3757497603d692def1fec6e75f
Auto-generated-cl: translation import
 2015-11-04 05:09:10 -08:00
Diego Perez
631c2ffd6f Update StaticLayout_Delegate to use new nLoadHyphenator 
Small fix to update call parameters

Change-Id: I4322aa212493ec2970ae17ec1918b9b7e2f8e93a
 2015-11-04 11:35:34 +00:00
Riley Andrews
0394a0c399 Convert ashmem bitmap thresholds to constants. 
Bug 25256717

Change-Id: I23e2795ef8798d83bf60dcbd6ff2e7093fcaa9b0
Signed-off-by: Riley Andrews <riandrews@google.com>
 2015-11-03 23:52:17 -08:00
Daniel Koulomzin
6393887063 ActivityView gets its own thread pool. DO NOT MERGE am: 7e19e286cc -s ours am: 6e0a83bcd9 
am: d90c2da23c

* commit 'd90c2da23c8ad22819d400d4803ed63c7f856d63':
  ActivityView gets its own thread pool. DO NOT MERGE
 2015-11-04 00:11:13 +00:00
Daniel Koulomzin
d90c2da23c ActivityView gets its own thread pool. DO NOT MERGE am: 7e19e286cc -s ours 
am: 6e0a83bcd9

* commit '6e0a83bcd97574451e83d58ac646af9daf3216be':
  ActivityView gets its own thread pool. DO NOT MERGE
 2015-11-04 00:02:32 +00:00
Daniel Koulomzin
6e0a83bcd9 ActivityView gets its own thread pool. DO NOT MERGE 
am: 7e19e286cc  -s ours

* commit '7e19e286cc990daaafe934ed82ddfa00762907d6':
  ActivityView gets its own thread pool. DO NOT MERGE
 2015-11-03 23:51:39 +00:00
Bill Yi
7624931a37 Merge commit \'bce5116b8d10c91436445cd0a0830bb51702bfd4\' into HEAD 
am: 2e8c3c11b7

* commit '2e8c3c11b7f482f01b1ff76a6217eaf129253809':
 2015-11-03 23:33:07 +00:00
Wale Ogunwale
8401a8d0c5 Merge "[ActivityManager] Fix NullPointerException in startNextMatchingActivity." am: 7810aed854 
am: d89b76a58d

* commit 'd89b76a58dcffa7dbc5974d14c7914f44233bef3':
  [ActivityManager] Fix NullPointerException in startNextMatchingActivity.
 2015-11-03 23:29:47 +00:00
Glenn Kasten
a10d826b1b Merge "BluetoothMidiDevice: change write type to support JamStik" am: 6079b990f1 
am: 613c63c742

* commit '613c63c742f1609297156fffe6169ee17db895f4':
  BluetoothMidiDevice: change write type to support JamStik
 2015-11-03 23:28:10 +00:00
Glenn Kasten
ff4e4425b7 Merge "BLE-MIDI: change binding for BluetoothMidiService" am: 5831944a6e 
am: bd32753700

* commit 'bd3275370000d657ea86e3a42f1bd76343b2e6a5':
  BLE-MIDI: change binding for BluetoothMidiService
 2015-11-03 23:26:41 +00:00
Daniel Koulomzin
7e19e286cc ActivityView gets its own thread pool. DO NOT MERGE 
Bug: 24316798

Change-Id: I4278fa792cec8d2710f2f41eed02ba4a14af7052
 2015-11-03 17:53:45 -05:00
Bill Yi
2e8c3c11b7 Merge commit 'bce5116b8d10c91436445cd0a0830bb51702bfd4' into HEAD 2015-11-03 14:29:59 -08:00