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

309668 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
6213e82f0c Merge "AAPT2: Add --package-id flag for feature-split suppport" 2017-03-07 20:42:30 +00:00
Stephen Chen
dad3ffad30 Merge "Create a Tron event for opening the network scorer settings page." 2017-03-07 20:41:18 +00:00
TreeHugger Robot
9165948219 Merge "Retry SECURITY_LOGS_AVAILABLE if DO doesn't request the logs" 2017-03-07 20:21:29 +00:00
TreeHugger Robot
48a58baea2 Merge "Enable escrow tokens on automotive builds." 2017-03-07 19:14:54 +00:00
Filip Pavlis
e88fbbac12 Merge "Fix home/back buttons flow in PreferenceActivity." 2017-03-07 19:09:50 +00:00
Adam Lesinski
f34b6f4f2b AAPT2: Add --package-id flag for feature-split suppport 
Bug: 35928935
Change-Id: Ia8496505e61cfcfdb8f9f62366d2f36e453db111
Test: make aapt2_tests
 2017-03-07 11:06:16 -08:00
Filip Pavlis
6af15ebcfe Fix home/back buttons flow in PreferenceActivity. 
Bug: b/35977048
Test: Done manually. Automated test will be added later.

After recent changes in PreferenceActivity finishing the activity on
pressing back is not correct anymore. Instead onBackButton method should
be called to deal with it (we have fragments transactions for instance).

There can be multiple buttons:
1. The native default one - calls onBackPressed by default so no extra work
needed.
2. PreferenceActivity has buttons that can de displayed when settting
EXTRA_PREFS_SHOW_BUTTON_BAR to true. But it is a private API and I
didn't find any usage of it, so there is no need to change that. Also
it looks like something very specific used in WiFi wizards.
3. Apps often use a toolbar that has a home button which essentialy
emulates back button. The issue is that this Activity never had support
for this. So apps had to override onOptionsItemSelected and some of
those are unfortunately calling finish() which worked previously when
PreferenceActivity wasn't using fragments in single pane. This CL adds
support so app will no longer need to override that method and some
apps need to be instructed to use that override in O.

Change-Id: I94f557edb2e03f89fbf02e800beb390b2ad0544f
 2017-03-07 19:05:57 +00:00
Calin Juravle
9108ae1a16 Merge "PackageManager: Clean up code related to foreign dex use" 2017-03-07 18:48:17 +00:00
Pavel Grafov
9cdba2722f Retry SECURITY_LOGS_AVAILABLE if DO doesn't request the logs 
Test: manually, with TestDPC.
Bug: 34186771
Change-Id: I99ec406b05f7b072c2c729f6336d1a5cf0f7c3d4
 2017-03-07 18:43:36 +00:00
Stephen Chen
be9a9a60ae Create a Tron event for opening the network scorer settings page. 
Bug: 35854268
Test: n/a
Change-Id: I0a021dcc9016f163f75b8077678f54df1c4f2bf6
 2017-03-07 10:39:38 -08:00
TreeHugger Robot
7ef25b7894 Merge "Add ColorSpace information on Bitmap" 2017-03-07 18:37:13 +00:00
Alan Viverette
31b0486d1b Merge "Add "since" annotations for Support Lib in framework docs build" 2017-03-07 18:29:29 +00:00
Chris Wren
20a80efa34 Merge "delete obsolete tests" 2017-03-07 18:28:25 +00:00
Scott Main
798dcd93fd Merge "Mark @ symbols in code snippet as literal so javadoc doesn't choke on them. Which for some reason only starts to happen when we start processing the annotation methods in this CL: https://googleplex-android-review.git.corp.google.com/#/c/1892771/" 2017-03-07 18:25:38 +00:00
Chris Wren
37d9f06e5b delete obsolete tests 
this code was removed in I94732c84564e4cb25d77b63be8beb4aab4c38985

Test: tests are deleted
Change-Id: I1dd466ec8c91de3e39d8019882a92f03aba4f357
 2017-03-07 13:24:18 -05:00
TreeHugger Robot
a61627935e Merge "Support non-system Font Providers" 2017-03-07 18:17:15 +00:00
Chris Wren
0697f96491 Merge "add clear methods to LogMaker" 2017-03-07 17:54:53 +00:00
Chris Craik
3cad2c33ee Merge "Workaround arc textures drawing outside of bounds" 2017-03-07 17:53:22 +00:00
Chris Wren
877f51ae88 Merge "remove the last of the legacy log helpers" 2017-03-07 17:50:15 +00:00
TreeHugger Robot
609d12dfc0 Merge "Fixing issue with wrong stack being brought forward." 2017-03-07 17:44:07 +00:00
TreeHugger Robot
c7bc9df672 Merge "Log notification channels and groups." 2017-03-07 17:41:49 +00:00
Jerome Gaillard
ce29b88233 Merge "Update layoutlib following Change Ia12d448a" 2017-03-07 17:11:16 +00:00
Andreas Gampe
19f1844e7e Merge "Framework: Ensure image heap string literals for Patterns" am: d0f092af84 am: 838851364b 
am: 5fe3eb7696

Change-Id: Ia0bf25c740eedee436436e573241a59685db2fbd
 2017-03-07 17:08:43 +00:00
Andreas Gampe
5fe3eb7696 Merge "Framework: Ensure image heap string literals for Patterns" am: d0f092af84 
am: 838851364b

Change-Id: I0b19a98ca157d87c41a3a305b9ae59bb65a9cffe
 2017-03-07 17:03:51 +00:00
Etan Cohen
a123f73a1c Merge "[CM] Allow timeout in request network" am: 8328f27a87 am: 645b48c8af 
am: ac879cbcaf

Change-Id: If42250966d619073d45d608aab454589213b1756
 2017-03-07 17:02:05 +00:00
Andreas Gampe
838851364b Merge "Framework: Ensure image heap string literals for Patterns" 
am: d0f092af84

Change-Id: I69886924b3aca6c050239069c00e166142e2e522
 2017-03-07 16:59:12 +00:00
Etan Cohen
ac879cbcaf Merge "[CM] Allow timeout in request network" am: 8328f27a87 
am: 645b48c8af

Change-Id: Ie3438ba967887ab7776eefaf05a6cf915e866f82
 2017-03-07 16:55:59 +00:00
Tobias Thierer
ab9211b8e3 Merge "Track: ICU TimeZone: publish TIMEZONE_* constants" am: aa4877e295 am: b96d428e40 
am: 6779441da0

Change-Id: Ib6b611e88dc342d5ce28e5594db142d54b840c20
 2017-03-07 16:55:59 +00:00
Treehugger Robot
d0f092af84 Merge "Framework: Ensure image heap string literals for Patterns" 2017-03-07 16:50:59 +00:00
Etan Cohen
645b48c8af Merge "[CM] Allow timeout in request network" 
am: 8328f27a87

Change-Id: Ic7a3da0a5292be5e13abca9c98c422bc2f50f3a0
 2017-03-07 16:49:53 +00:00
Tobias Thierer
6779441da0 Merge "Track: ICU TimeZone: publish TIMEZONE_* constants" am: aa4877e295 
am: b96d428e40

Change-Id: Ie91a466fa5e774cb5cb64361f00bb29643805cf0
 2017-03-07 16:49:38 +00:00
Tobias Thierer
b96d428e40 Merge "Track: ICU TimeZone: publish TIMEZONE_* constants" 
am: aa4877e295

Change-Id: I94edc483a5d9dfeabb19d0eb687c10ba2df6eac9
 2017-03-07 16:43:16 +00:00
Etan Cohen
8328f27a87 Merge "[CM] Allow timeout in request network" 2017-03-07 16:40:27 +00:00
Tobias Thierer
aa4877e295 Merge "Track: ICU TimeZone: publish TIMEZONE_* constants" 2017-03-07 16:35:17 +00:00
TreeHugger Robot
c7eefdbda7 Merge "Framework: Avoid string allocations" 2017-03-07 16:02:54 +00:00
Chris Wren
f33926abed remove the last of the legacy log helpers 
All logs should now flow through LogMaker.

Bug: 34705522
Test: mmma -j20 platform_testing/tests/functional/notificationtests && adb install -r -g /data/app/NotificationFunctionalTests/NotificationFunctionalTests.apk && adb shell am instrument -w -e iterations 1 -e class com.android.notification.functional.NotificationInteractionTests com.android.notification.functional/android.support.test.runner.AndroidJUnitRunner && runtest --path platform_testing/libraries/metrics-helper/tests
Change-Id: I94732c84564e4cb25d77b63be8beb4aab4c38985
 2017-03-07 10:49:07 -05:00
Chris Wren
a7c1b80f5f add clear methods to LogMaker 
To support object reuse.

Test: runtest --path frameworks/base/core/tests/coretests/src/android/metrics
Bug: 36020746
Change-Id: I09e5689da70963e9aba3bd8428a55acfcbe4e92a
 2017-03-07 10:41:39 -05:00
Julia Reynolds
d373d78d15 Log notification channels and groups. 
Test: manual, runtest systemui-notification
Change-Id: I326a35ae87e7a3dc4b2587271056b7dd5cd11f8d
 2017-03-07 15:25:27 +00:00
Clara Bayarri
3c4be77db9 Support non-system Font Providers 
To do this, the developer must specify the set of certificate
hashes that represent the authority's app. This allows us to
verify that the authority we find is indeed the one intended
by the developer.

Bug: 35025705
Test: runtest --path frameworks/base/core/tests/coretests/src/android/provider/FontsContractTest.java
runtest --path frameworks/base/core/tests/coretests/src/android/content/res/FontResourcesParserTest.java
CTS attached to topic
Change-Id: I605f9a93bbca8705936ead08efb4a5b4fdcc4882
 2017-03-07 14:59:33 +00:00
Erik Kline
a33ae2d884 Merge "request{LinkProperties,NetworkCapabilities} no longer needed" am: 75dfc5bd91 am: 0f901af920 
am: bb54baba04

Change-Id: Id2aa8aeff6d299edb85955c12ab0a04023458597
 2017-03-07 13:42:11 +00:00
Erik Kline
bb54baba04 Merge "request{LinkProperties,NetworkCapabilities} no longer needed" am: 75dfc5bd91 
am: 0f901af920

Change-Id: I891abf2a1a4138b9d80b8544ac6d09deda8d3d62
 2017-03-07 13:38:07 +00:00
Erik Kline
0f901af920 Merge "request{LinkProperties,NetworkCapabilities} no longer needed" 
am: 75dfc5bd91

Change-Id: I79b9323be242ed5d2bf83962f78c613a465a20b8
 2017-03-07 13:33:29 +00:00
Treehugger Robot
75dfc5bd91 Merge "request{LinkProperties,NetworkCapabilities} no longer needed" 2017-03-07 13:27:11 +00:00
Abodunrinwa Toki
0f502cb1b6 Merge "Prevent crashes when in insertion mode." 2017-03-07 12:54:52 +00:00
Jerome Gaillard
013edba605 Update layoutlib following Change Ia12d448a 
Test: layoutlib tests
Change-Id: I66632bcef3a05d3d89e7fc6a37f099100feed0ad
 2017-03-07 12:34:37 +00:00
Rubin Xu
c068aa2209 Merge "Allow user with a profile owner to have escrow tokens" 2017-03-07 10:59:53 +00:00
Erik Kline
465c46d555 request{LinkProperties,NetworkCapabilities} no longer needed 
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - manual USB tethering toggling between WiFi and mobile
Bug: 32163131
Change-Id: I57edf5114b6361f320577c7870e40f8b3cdf74ce
 2017-03-07 17:18:06 +09:00
Erik Kline
a1d0c089d2 Merge "Handle null NetworkState updates" am: ae758b2c7f am: 4cf8f7a8cd 
am: b48eb4f71a

Change-Id: Idd5cf1b8de35cca3a7518d6ed76d87044c8846b4
 2017-03-07 06:40:24 +00:00
Erik Kline
b48eb4f71a Merge "Handle null NetworkState updates" am: ae758b2c7f 
am: 4cf8f7a8cd

Change-Id: I47cdb040baed8c4c700ff7412a01d79f8edccbd2
 2017-03-07 06:36:13 +00:00
Erik Kline
4cf8f7a8cd Merge "Handle null NetworkState updates" 
am: ae758b2c7f

Change-Id: I9d8d5c176804344a40f6646acf65d2d8a5cd976f
 2017-03-07 06:31:48 +00:00