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

222198 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chad Brubaker
aaffed261c Merge "Add NetworkSecurityConfigProvider.install" am: 08181cf647 am: 97f92ce41e 
am: 1627a091f4

* commit '1627a091f48d1295653d37a580e30f89005fb6e5':
  Add NetworkSecurityConfigProvider.install
 2015-11-17 23:36:13 +00:00
Deepanshu Gupta
ae03bc0be3 Revert "LayoutLib: Fix true transparency in status bar." am: 4ea74d2960 
am: 377cc4887d

* commit '377cc4887d3557377f63bfe9d179623985c9484e':
  Revert "LayoutLib: Fix true transparency in status bar."
 2015-11-17 23:34:24 +00:00
Deepanshu Gupta
71daca031e Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev am: 42a893b50b 
am: dd97829cf2

* commit 'dd97829cf2b8599058f0410ea45bc84cd86e839b':
  AppCompatActionBar: use findClass to test presence
 2015-11-17 23:33:02 +00:00
Svetoslav Ganov
488b4b5872 Merge "Handle renamed packages during default grants" am: 140b101fcd am: 60cb22008c 
am: 9bf367030c

* commit '9bf367030c24e93c711d2ba9ca5594e70a652596':
  Handle renamed packages during default grants
 2015-11-17 23:31:42 +00:00
Colin Cross
b2b5c89d8c Merge "Vibra: Add loading of the vibrator hardware module." am: 5603eca33c am: 358ad4980f 
am: 68cea4e7d1

* commit '68cea4e7d17cf00ce3001cf23fe36a7f1e77fe86':
  Vibra: Add loading of the vibrator hardware module.
 2015-11-17 23:30:18 +00:00
Deepanshu Gupta
1a3b1ea872 LayoutLib: IntelliJ changed project files. am: 22931224d9 
am: ab45fc1a4f

* commit 'ab45fc1a4f9726630322b7579168835d84711bdf':
 2015-11-17 23:28:47 +00:00
Michael Wright
9bac0a1d24 Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 am: 313c7b2ee0 am: c73255d8ab am: 053f241cc7 
am: 46f92eafe6  -s ours

* commit '46f92eafe669f3ae29299860bf79378ffa111898':
 2015-11-17 23:27:26 +00:00
Chad Brubaker
93f027c32f Merge "Dedupe trust anchors" am: 690b5f6c0a am: e2caaea951 
am: d2347a89fb

* commit 'd2347a89fb1a01f550a1b17c68ee234958c1be42':
  Dedupe trust anchors
 2015-11-17 23:25:52 +00:00
Bryce Lee
85d2e8b4ca Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am: cb8749c903 am: 0fa22022a3 
am: 4b60d12ef9

* commit '4b60d12ef99a31508be8aed18a53446255f94fc8':
 2015-11-17 23:24:09 +00:00
Joe LaPenna
33721c935f Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev am: d083b37917 -s ours am: 7f0a1556ec -s ours 
am: 70e0b4239c  -s ours

* commit '70e0b4239c39799988ff007b21c3393b6f410452':
 2015-11-17 23:22:52 +00:00
Eino-Ville Talvala
346bc968f9 Merge "Don\'t use timestamps with all zero" am: 9574e58027 am: be1a3f8b66 
am: 7ca29b3ea2

* commit '7ca29b3ea287883c1c55c62a0e654a87cc81b75d':
  Don't use timestamps with all zero
 2015-11-17 23:21:29 +00:00
Sanket Padawe
d93fe21662 Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am: abea6dc466 am: ccfcb636ae am: 63e6aa8571 am: 32a190bd78 
am: 3bc8979d74

* commit '3bc8979d74e8a6c9e0a1c52031bfd0a810bccd1a':
 2015-11-17 23:20:08 +00:00
Deepanshu Gupta
433f072cac Merge "WindowDecorActionBar name change fix." into mnc-ub-dev am: 62302bd72a 
am: ce400cd75e

* commit 'ce400cd75e1e1a90c0b4da4de90d7314fd21dca8':
 2015-11-17 23:18:50 +00:00
Michael Kwan
b7fa400367 DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am: 8d6630b87c -s ours am: f23229f45f -s ours 
am: 6881185307  -s ours

* commit '6881185307c4f582996fb3a7792453b06857bebb':
 2015-11-17 23:17:24 +00:00
Eino-Ville Talvala
d9f32c9f4c Camera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 am: 062c629e5c am: 784f0f15a9 
am: f5b98ee1dc

* commit 'f5b98ee1dc05c2f9be839c56bf6e90bff99807bc':
 2015-11-17 23:16:02 +00:00
Alex Klyubin
8f49178b8f Merge "Insert Android Keystore JCA Provider at the correct position." am: 887d348d7e am: 5995579f5f 
am: 00245ffce4

* commit '00245ffce4d08fbb6aeaeba62b8a30ce234862fa':
  Insert Android Keystore JCA Provider at the correct position.
 2015-11-17 23:14:38 +00:00
Erik Wolsheimer
39d554b7aa Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2015-11-17 23:13:36 +00:00
Erik Wolsheimer
c088a4b995 Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 am: b45defae8e 
am: 2fba776ee0

* commit '2fba776ee0227e54f750dc6b87c8ca1bc1fd556f':
 2015-11-17 23:13:07 +00:00
Erik Wolsheimer
ee25341a9f Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 am: b45defae8e 
am: 2fba776ee0

* commit '2fba776ee0227e54f750dc6b87c8ca1bc1fd556f':
 2015-11-17 23:11:59 +00:00
Mark Salyzyn
a8d18e8580 Merge "Revert "jni: is loggable speedup, not within signal"" am: 3c54ed00f3 am: c53dad8d16 
am: 45f88d02de

* commit '45f88d02deb8b78f72b7315b5d42567639ad7ece':
  Revert "jni: is loggable speedup, not within signal"
 2015-11-17 23:10:30 +00:00
Geoff Mendal
46595c4c4f Import translations. DO NOT MERGE am: 83d65fea01 -s ours am: a6c50551cd -s ours 
am: c94a189e5f  -s ours

* commit 'c94a189e5f9ca87fdd314cae3c24c50aacf231dc':
 2015-11-17 23:09:06 +00:00
Calin Juravle
8d40c367b0 Merge "Remove obsolete profile handling from AndroidRuntime." am: 360e95a90d am: e20120031f 
am: c3a70ce001

* commit 'c3a70ce0015e9117268040378c6adb6239ead897':
  Remove obsolete profile handling from AndroidRuntime.
 2015-11-17 23:07:36 +00:00
Chris Craik
9ecf4da6bc Merge "Add temporary layer alpha fallback to OpReorderer" 2015-11-17 22:53:40 +00:00
Chris Craik
8ecf41c61a Add temporary layer alpha fallback to OpReorderer 
Also adds logic to clip temporary layers to viewport both for
efficiency and to allow large ones (such as the fallback case) to fit
in max texture size.

Change-Id: Iee51495220f5ca1dc7e6f5fd3615db2e896efd74
 2015-11-17 14:50:49 -08:00
Julia Reynolds
054c5dcf4a Notifications can only have 1 topic. 
Change-Id: Id0ab6bca352b969431d4ba68167074e514a98980
 2015-11-17 17:13:13 -05:00
Makoto Onuki
a87401054f Merge "Allow PO to clear password even if the same apk has DA" 2015-11-17 22:11:20 +00:00
Makoto Onuki
c2f521a7d8 Allow PO to clear password even if the same apk has DA 
Bug 25645900

Change-Id: I7d2d9fbf6a4dc65ac63fb14e6ee6b9abc1f1c0e7
 2015-11-17 14:10:12 -08:00
Alan Viverette
baf7b9adf4 Merge "Use correct rounding in View for potentially negative values" 2015-11-17 21:44:14 +00:00
Wale Ogunwale
261eda26d9 Merge changes Id86e9773,I682afe1b 
* changes:
  Moved BackdropFrameRenderer from NonClientDecorView to its own class file
  Moved management of NonClientDecorView from PhoneWindow to DecorView
 2015-11-17 21:26:59 +00:00
Chad Brubaker
1627a091f4 Merge "Add NetworkSecurityConfigProvider.install" am: 08181cf647 
am: 97f92ce41e

* commit '97f92ce41e66b54e56733f18bdaae056f08c0ae7':
  Add NetworkSecurityConfigProvider.install
 2015-11-17 21:18:12 +00:00
Julia Reynolds
e122d30557 Merge "Allow DND mode to suppress visual interruptions." 2015-11-17 21:16:05 +00:00
Julia Reynolds
f612869ae1 Allow DND mode to suppress visual interruptions. 
Bug: 25423508
Change-Id: Idd8242e4bc00a749dbe0b5503c458375fc017072
 2015-11-17 21:10:36 +00:00
Chad Brubaker
97f92ce41e Merge "Add NetworkSecurityConfigProvider.install" 
am: 08181cf647

* commit '08181cf647b1a1e440528f3f58ef6bf4e98a4832':
  Add NetworkSecurityConfigProvider.install
 2015-11-17 20:59:04 +00:00
Deepanshu Gupta
377cc4887d Revert "LayoutLib: Fix true transparency in status bar." 
am: 4ea74d2960

* commit '4ea74d2960688db6aa13452765dd5f2d07a40189':
  Revert "LayoutLib: Fix true transparency in status bar."
 2015-11-17 20:50:07 +00:00
Chad Brubaker
08181cf647 Merge "Add NetworkSecurityConfigProvider.install" 2015-11-17 20:46:49 +00:00
Deepanshu Gupta
e4826981f2 LayoutLib: IntelliJ changed project files. am: 22931224d9 am: 66840955d8 am: e45abdb126 
am: 606e5a0c56

* commit '606e5a0c562a461919e90ddf1e41036d926c9716':
  LayoutLib: IntelliJ changed project files.
 2015-11-17 20:43:02 +00:00
Michael Wright
fe882edc12 Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 am: 313c7b2ee0 am: c73255d8ab am: 053f241cc7 am: e2af036719 am: cd00ba1a71 
am: 526c98cb7f  -s ours

* commit '526c98cb7fa1e1bf7464e4cfe87115569d2a9dcc':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 20:41:30 +00:00
Deepanshu Gupta
dd97829cf2 Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev 
am: 42a893b50b

* commit '42a893b50b2763d7a2a3da4006c9433afaf86cfd':
  AppCompatActionBar: use findClass to test presence
 2015-11-17 20:32:31 +00:00
Deepanshu Gupta
4ea74d2960 Revert "LayoutLib: Fix true transparency in status bar." 
This reverts commit 4eb298a941c3f465944b63f1a06518e911681c89.

Even though this is techinically closer to what the framework does, the
fix is not complete. As a result, it looks worse when using AppCompat
themes. Revert the change for the release.

Change-Id: I67c1002ea17dee7234d78e2d13aab876467bd70f
 2015-11-17 12:25:25 -08:00
Deepanshu Gupta
606e5a0c56 LayoutLib: IntelliJ changed project files. am: 22931224d9 am: 66840955d8 
am: e45abdb126

* commit 'e45abdb1267781c2f3f4fa65cb8771c5d01d0956':
  LayoutLib: IntelliJ changed project files.
 2015-11-17 20:24:20 +00:00
Svetoslav Ganov
9bf367030c Merge "Handle renamed packages during default grants" am: 140b101fcd 
am: 60cb22008c

* commit '60cb22008c602c5345504eacb4eb68ea0ac69cf0':
  Handle renamed packages during default grants
 2015-11-17 20:24:06 +00:00
Deepanshu Gupta
42a893b50b Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev 2015-11-17 20:22:43 +00:00
Wale Ogunwale
0b3562db3e Moved BackdropFrameRenderer from NonClientDecorView to its own class file 
Bug: 24810450
Change-Id: Id86e97733161499bbc59617433792f5ddc4e7f9e
 2015-11-17 12:19:45 -08:00
Colin Cross
68cea4e7d1 Merge "Vibra: Add loading of the vibrator hardware module." am: 5603eca33c 
am: 358ad4980f

* commit '358ad4980fd6ea0ed22e81b3816572ec9ba39f53':
  Vibra: Add loading of the vibrator hardware module.
 2015-11-17 20:06:25 +00:00
Svetoslav Ganov
60cb22008c Merge "Handle renamed packages during default grants" 
am: 140b101fcd

* commit '140b101fcdbdf413b914b5625b19577784ad9d88':
  Handle renamed packages during default grants
 2015-11-17 20:06:21 +00:00
Deepanshu Gupta
e45abdb126 LayoutLib: IntelliJ changed project files. am: 22931224d9 
am: 66840955d8

* commit '66840955d817b2ca42a4a573dd9186b5ad5b25aa':
  LayoutLib: IntelliJ changed project files.
 2015-11-17 20:06:20 +00:00
Svetoslav Ganov
140b101fcd Merge "Handle renamed packages during default grants" 2015-11-17 19:55:37 +00:00
Deepanshu Gupta
ab45fc1a4f LayoutLib: IntelliJ changed project files. 
am: 22931224d9

* commit '22931224d9a9845d316a9ea30e56557bec0b2e45':
  LayoutLib: IntelliJ changed project files.
 2015-11-17 19:54:06 +00:00
Svet Ganov
f443384d9e Handle renamed packages during default grants 
If an L device has a privileged app on the system image which was
updated and an M OTA renames the app package (supported only for
privileged apps) we end up with a disabled system package setting
with no package information. Since we are not doing a null check
of the package we get from the disabled package settings during
default grants we crash leaving the system in a bad state.

bug:25687380

Change-Id: I4f2ebcaf471e4bd1696298eab4716b50c52ca5c4
 2015-11-17 11:53:31 -08:00
Colin Cross
358ad4980f Merge "Vibra: Add loading of the vibrator hardware module." 
am: 5603eca33c

* commit '5603eca33c8e322997029d3101fd2442df3c274e':
  Vibra: Add loading of the vibrator hardware module.
 2015-11-17 19:51:57 +00:00