Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
233,589 Commits 3 Branches 0 Tags
64e9367dc18b71ce3aca66357328a809ffbfb2dd
Commit Graph

233589 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
64e9367dc1 Import translations. DO NOT MERGE 
Change-Id: Ic4654a8012755d1262787852e795500f7c249520
Auto-generated-cl: translation import
 2016-02-15 05:23:07 -08:00
Neil Fuller
cfdc3261b2 Add flags needed to switch Jack to 1.8 for CTS targets am: a835180b74 
am: a493e4a151

* commit 'a493e4a151a3ea6a8a973391516057ce43f8dbaa':
  Add flags needed to switch Jack to 1.8 for CTS targets
 2016-02-15 12:23:23 +00:00
Neil Fuller
a493e4a151 Add flags needed to switch Jack to 1.8 for CTS targets 
am: a835180b74

* commit 'a835180b74af2cad853db08e8d41a7b04773759b':
  Add flags needed to switch Jack to 1.8 for CTS targets
 2016-02-15 12:17:29 +00:00
Neil Fuller
a835180b74 Add flags needed to switch Jack to 1.8 for CTS targets 
When linking against .jack files that contain 1.8 language
features Jack (currently) requires -D jack.java.source.version=1.8.

"core-tests" includes 1.8 language features.

Bug: 27113322
Bug: 26953739
Change-Id: Ib9ceaadafc9c1d41ff137c48111ad3b060f7e248
 2016-02-15 12:07:21 +00:00
Narayan Kamath
c7a92d1ea9 Merge "Track libcore change 5731615b4d705b5af63a3126d84b8786862477d." into nyc-dev am: 2a5abc9510 
am: f14e6413b9

* commit 'f14e6413b9e10df21fdb8de25f7da63f1ee7b31c':
  Track libcore change 5731615b4d705b5af63a3126d84b8786862477d.
 2016-02-15 11:51:08 +00:00
Narayan Kamath
f14e6413b9 Merge "Track libcore change 5731615b4d705b5af63a3126d84b8786862477d." into nyc-dev 
am: 2a5abc9510

* commit '2a5abc95104d109db3b09aa27c6718b2be7a975b':
  Track libcore change 5731615b4d705b5af63a3126d84b8786862477d.
 2016-02-15 11:44:44 +00:00
Narayan Kamath
2a5abc9510 Merge "Track libcore change 5731615b4d705b5af63a3126d84b8786862477d." into nyc-dev 2016-02-15 11:38:34 +00:00
Neil Fuller
fec151053b Merge "Add flags needed to switch Jack to 1.8 for CTS targets" into nyc-dev am: 9c6827c017 
am: 7c24d565b2

* commit '7c24d565b2edcb2111b8dbd75729496c351f7d5b':
  Add flags needed to switch Jack to 1.8 for CTS targets
 2016-02-15 11:26:54 +00:00
Neil Fuller
7c24d565b2 Merge "Add flags needed to switch Jack to 1.8 for CTS targets" into nyc-dev 
am: 9c6827c017

* commit '9c6827c017e64c3ea4e9f0c9a4b33fba4363304c':
  Add flags needed to switch Jack to 1.8 for CTS targets
 2016-02-15 11:21:22 +00:00
Neil Fuller
9c6827c017 Merge "Add flags needed to switch Jack to 1.8 for CTS targets" into nyc-dev 2016-02-15 11:16:06 +00:00
Narayan Kamath
64aebdc02b Track libcore change 5731615b4d705b5af63a3126d84b8786862477d. 
bug: 26689841
Change-Id: I463543c67cc525583d1fd6f7031a0d38f543d8a2
 2016-02-15 11:08:06 +00:00
Nicolas Prévot
4e8bbd23e5 Merge "Allow privileged apps to set the organization color." into nyc-dev am: eff90bd5ff 
am: 2da7b6ebdb

* commit '2da7b6ebdb3ade426fa7b69ed0b47779d15ab109':
  Allow privileged apps to set the organization color.
 2016-02-15 10:57:17 +00:00
Nicolas Prévot
2da7b6ebdb Merge "Allow privileged apps to set the organization color." into nyc-dev 
am: eff90bd5ff

* commit 'eff90bd5ff6bd50325149a5010183277bd76f4c6':
  Allow privileged apps to set the organization color.
 2016-02-15 10:51:42 +00:00
Nicolas Prévot
eff90bd5ff Merge "Allow privileged apps to set the organization color." into nyc-dev 2016-02-15 10:47:41 +00:00
Bartosz Fabianowski
bf43eac076 Merge "Remove wifiConfiguration.isVisibleToUser()" into mm-wireless-dev am: e1bdbd216f am: 3e425f6c4b 
am: 0100bbc4dd

* commit '0100bbc4dd9b503a39f42424d6e6c941ecd347e4':
  Remove wifiConfiguration.isVisibleToUser()
 2016-02-15 10:14:42 +00:00
Bartosz Fabianowski
0100bbc4dd Merge "Remove wifiConfiguration.isVisibleToUser()" into mm-wireless-dev am: e1bdbd216f 
am: 3e425f6c4b

* commit '3e425f6c4be3fc30695473329c6364abfe69a059':
  Remove wifiConfiguration.isVisibleToUser()
 2016-02-15 10:08:29 +00:00
Bartosz Fabianowski
3e425f6c4b Merge "Remove wifiConfiguration.isVisibleToUser()" into mm-wireless-dev 
am: e1bdbd216f

* commit 'e1bdbd216fef6d1f0bb6b3c61cc95abba3e67af7':
  Remove wifiConfiguration.isVisibleToUser()
 2016-02-15 10:02:55 +00:00
Bartosz Fabianowski
e1bdbd216f Merge "Remove wifiConfiguration.isVisibleToUser()" into mm-wireless-dev 2016-02-15 09:56:53 +00:00
Ian Pedowitz
f2b4df84cb Revert "Fix missing observer reply callbacks" am: e4c1ccec72 
am: b5733ec9e8

* commit 'b5733ec9e8f3a28aa8e3d7ca8036d4ce2594453a':
  Revert "Fix missing observer reply callbacks"
 2016-02-14 23:51:31 +00:00
Ian Pedowitz
b5733ec9e8 Revert "Fix missing observer reply callbacks" 
am: e4c1ccec72

* commit 'e4c1ccec7248443c23dd4a8d6725a4f492204726':
  Revert "Fix missing observer reply callbacks"
 2016-02-14 23:45:47 +00:00
Ian Pedowitz
e4c1ccec72 Revert "Fix missing observer reply callbacks" 
This should not have merged from mnc-dr-dev, the underlying implementation has changed

This reverts commit dbb75248b1.
 2016-02-14 15:36:48 -08:00
Akshay Thakker
24785d6d73 Merge "Fix missing observer reply callbacks" into mnc-dr-dev am: d1811e07d5 am: a3798d7a92 am: d6de840957 am: b9f686968c 
am: 0318738cc6

* commit '0318738cc6b6fe97e2e4f32d6a8ef803714623c8':
  Fix missing observer reply callbacks
 2016-02-14 22:59:53 +00:00
Akshay Thakker
16bfac9fb1 Merge "Exit getAllValidScorers early if not the primary." into mnc-dr-dev am: ae31e13ae8 am: eae2b8978f am: bc45c5e1a3 am: d2ab7430b3 
am: 3fabb535d8

* commit '3fabb535d84defbe4845d5b78f7749bd1d68664d':
  Exit getAllValidScorers early if not the primary.
 2016-02-14 22:54:32 +00:00
Akshay Thakker
0318738cc6 Merge "Fix missing observer reply callbacks" into mnc-dr-dev am: d1811e07d5 am: a3798d7a92 am: d6de840957 
am: b9f686968c

* commit 'b9f686968cbbf953700f68be0076a461a71e5b67':
  Fix missing observer reply callbacks
 2016-02-14 22:53:24 +00:00
Dan Sandler
0c411d8bd2 DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm. am: e79c73d626 am: 4baa901205 am: c644228110 -s ours am: f16ff85adc 
am: f9a485bd58  -s ours

* commit 'f9a485bd580899bc4c03ab81fcdb2b04a529e82f':
  DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.
 2016-02-14 22:53:21 +00:00
Akshay Thakker
3fabb535d8 Merge "Exit getAllValidScorers early if not the primary." into mnc-dr-dev am: ae31e13ae8 am: eae2b8978f am: bc45c5e1a3 
am: d2ab7430b3

* commit 'd2ab7430b38356cc438d070ba07dfcd38381c62f':
  Exit getAllValidScorers early if not the primary.
 2016-02-14 22:49:56 +00:00
Akshay Thakker
b9f686968c Merge "Fix missing observer reply callbacks" into mnc-dr-dev am: d1811e07d5 am: a3798d7a92 
am: d6de840957

* commit 'd6de84095735a32e160f5ae9ce93489b0b19eeed':
  Fix missing observer reply callbacks
 2016-02-14 22:48:31 +00:00
Dan Sandler
f9a485bd58 DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm. am: e79c73d626 am: 4baa901205 am: c644228110 -s ours 
am: f16ff85adc

* commit 'f16ff85adc9f1ea4c79f2aae9331e6ea2188c719':
  DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.
 2016-02-14 22:48:22 +00:00
Akshay Thakker
d2ab7430b3 Merge "Exit getAllValidScorers early if not the primary." into mnc-dr-dev am: ae31e13ae8 am: eae2b8978f 
am: bc45c5e1a3

* commit 'bc45c5e1a35fb248cd327846e0c68f930b64d653':
  Exit getAllValidScorers early if not the primary.
 2016-02-14 22:42:32 +00:00
Dan Sandler
f16ff85adc DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm. am: e79c73d626 am: 4baa901205 
am: c644228110  -s ours

* commit 'c64422811060548ac9f754b12b2ce23ed81b1fe0':
  DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.
 2016-02-14 22:41:30 +00:00
Akshay Thakker
d6de840957 Merge "Fix missing observer reply callbacks" into mnc-dr-dev am: d1811e07d5 
am: a3798d7a92

* commit 'a3798d7a92ecefe1117b99a2e0f5edce1644f1d0':
  Fix missing observer reply callbacks
 2016-02-14 22:37:55 +00:00
Akshay Thakker
bc45c5e1a3 Merge "Exit getAllValidScorers early if not the primary." into mnc-dr-dev am: ae31e13ae8 
am: eae2b8978f

* commit 'eae2b8978f8cfdedac9404bf4c653f3f9b51f6dd':
  Exit getAllValidScorers early if not the primary.
 2016-02-14 22:36:51 +00:00
Dan Sandler
c644228110 DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm. am: e79c73d626 
am: 4baa901205

* commit '4baa9012058c8366d39ed9d07fee0f6da0fd6e71':
  DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.
 2016-02-14 22:35:39 +00:00
Akshay Thakker
a3798d7a92 Merge "Fix missing observer reply callbacks" into mnc-dr-dev 
am: d1811e07d5

* commit 'd1811e07d5ee751cbdc37a3ff84e2e010ead7adf':
  Fix missing observer reply callbacks
 2016-02-14 22:30:47 +00:00
Akshay Thakker
eae2b8978f Merge "Exit getAllValidScorers early if not the primary." into mnc-dr-dev 
am: ae31e13ae8

* commit 'ae31e13ae8785c627ac781a565fa41bc982cfb99':
  Exit getAllValidScorers early if not the primary.
 2016-02-14 22:27:20 +00:00
Dan Sandler
4baa901205 DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm. 
am: e79c73d626

* commit 'e79c73d6267681dbbc8bd4eccf9a79e3017f6fe9':
  DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.
 2016-02-14 22:25:09 +00:00
Akshay Thakker
d1811e07d5 Merge "Fix missing observer reply callbacks" into mnc-dr-dev 2016-02-14 22:23:54 +00:00
Akshay Thakker
ae31e13ae8 Merge "Exit getAllValidScorers early if not the primary." into mnc-dr-dev 2016-02-14 22:17:32 +00:00
Chong Zhang
c247646d65 Merge "Clearing mDestroying flag when app is made visible again" into nyc-dev am: 3dbcd203c5 
am: 252a40a101

* commit '252a40a101f24b33c694cb1e75208b82f14ac67a':
  Clearing mDestroying flag when app is made visible again
 2016-02-13 18:19:51 +00:00
Chong Zhang
252a40a101 Merge "Clearing mDestroying flag when app is made visible again" into nyc-dev 
am: 3dbcd203c5

* commit '3dbcd203c57e9845582b59d9d5914bd6df7d2e1f':
  Clearing mDestroying flag when app is made visible again
 2016-02-13 18:14:25 +00:00
Chong Zhang
3dbcd203c5 Merge "Clearing mDestroying flag when app is made visible again" into nyc-dev 2016-02-13 18:09:47 +00:00
Jeff Tinker
3efba227e9 Merge "Add mediadrm service" into nyc-dev am: f35b991438 
am: ec3005d1a1

* commit 'ec3005d1a122ba081b0dff7d7a1709de2da176e4':
  Add mediadrm service
 2016-02-13 08:22:55 +00:00
Jeff Tinker
ec3005d1a1 Merge "Add mediadrm service" into nyc-dev 
am: f35b991438

* commit 'f35b9914383e6f55008e0c5d74f49a6365c9522f':
  Add mediadrm service
 2016-02-13 08:16:03 +00:00
Jeff Tinker
f35b991438 Merge "Add mediadrm service" into nyc-dev 2016-02-13 08:08:32 +00:00
Joe Onorato
af8d863a21 Merge "Fix the text so it\'s visible with current themes." into nyc-dev am: b5b85fc397 
am: d5ac450286

* commit 'd5ac450286b97e55b026e36c2d1824b697d3d320':
  Fix the text so it's visible with current themes.
 2016-02-13 08:04:55 +00:00
Adam Lesinski
e8cfcf207e AAPT2: Fix source output when error occurs in style am: 5f7c461be6 
am: 291be5465e

* commit '291be5465ea939a8e7a185bddcda586374f42021':
  AAPT2: Fix source output when error occurs in style
 2016-02-13 08:03:45 +00:00
Joe Onorato
d5ac450286 Merge "Fix the text so it\'s visible with current themes." into nyc-dev 
am: b5b85fc397

* commit 'b5b85fc397061587dbdfad3b7c6e1ff828014c0b':
  Fix the text so it's visible with current themes.
 2016-02-13 07:58:52 +00:00
Adam Lesinski
291be5465e AAPT2: Fix source output when error occurs in style 
am: 5f7c461be6

* commit '5f7c461be69b549e00c778dcb3a417dffc96e220':
  AAPT2: Fix source output when error occurs in style
 2016-02-13 07:57:11 +00:00
Joe Onorato
b5b85fc397 Merge "Fix the text so it's visible with current themes." into nyc-dev 2016-02-13 07:49:38 +00:00
Joe Onorato
68723c571e Fix the text so it's visible with current themes. 
Change-Id: Ia3f962a8a46ea05465476961de2d297cf08c75b4
 2016-02-12 23:41:45 -08:00