Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
251,426 Commits 3 Branches 0 Tags
d33451c8378590e4fca82ac11fcf122ccc5f2a84
Commit Graph

65285 Commits

Author SHA1 Message Date
Julia Reynolds
d33451c837 Merge changes from topic \'api_review\' into nyc-dev am: a0676c9 am: a6c9a89 
am: d9c4c76

* commit 'd9c4c7650f4ee6ea3282cc097d1d0f0756d32c69':
  Api review: Settings.
  Reduce spacing.

Change-Id: I781cda64e8ecfd64ba236f8b8401f2f20a7df5d1
 2016-04-26 16:16:09 +00:00
Andreas Gampe
37f11ecd43 Merge "Frameworks/base: Make debug helper lazy in ConnectivityManager" into nyc-dev am: 396c590 am: 12aea50 
am: d8998a4

* commit 'd8998a48c9ff362aaf081b1fd74877903c2dab11':
  Frameworks/base: Make debug helper lazy in ConnectivityManager

Change-Id: Iae09599af115044fd6e1c37c0f0222fe766281f0
 2016-04-26 16:15:18 +00:00
David Brazdil
badba5893f Merge "Change app selection policy for post-OTA verification" into nyc-dev am: 3eaf72d am: 9ada71d 
am: b424dd9

* commit 'b424dd9e1ea1c1be3577db90b8420b94eb5632c6':
  Change app selection policy for post-OTA verification

Change-Id: Ic81447d56181f0246af6127cd2b6331b1084a09e
 2016-04-26 16:14:50 +00:00
Narayan Kamath
c6a63f34cd LoadedApk: Don\'t set up JIT profile support inside the system_server. am: 2d4a222 am: 3ec2508 
am: 1f803c3

* commit '1f803c3c75cf089f704e1cbf2d81b56597f6c263':
  LoadedApk: Don't set up JIT profile support inside the system_server.

Change-Id: I9a8587ea42d116bdf60845e9f41b88c275c9b751
 2016-04-26 16:14:17 +00:00
Hui Shu
0b9717f813 Merge "WebView downgrade prevention logic" into nyc-dev am: e12d62b am: b5829cd 
am: bb639b6

* commit 'bb639b671ccf7d9d401665cc3bd31dac926e0228':
  WebView downgrade prevention logic

Change-Id: I28066d48ce1b68a9a370af1ca88e027c1e91df9d
 2016-04-26 16:12:17 +00:00
Jaewan Kim
9ea37b9bee Merge "PIP: Send KEYCODE_WINDOW to app first if PIP isn\'t exist" into nyc-dev am: bdc4700 am: 0f360d8 
am: 8416446

* commit '8416446ef78d6e51069027f7e8f8148b340b4332':
  PIP: Send KEYCODE_WINDOW to app first if PIP isn't exist

Change-Id: I3ac695a7729ceb8e8c06e6df150fe3be1c351d7f
 2016-04-26 16:07:31 +00:00
Julia Reynolds
d9c4c7650f Merge changes from topic \'api_review\' into nyc-dev am: a0676c9 
am: a6c9a89

* commit 'a6c9a892365864f715da31210304cdc3ada6a15b':
  Api review: Settings.
  Reduce spacing.

Change-Id: I4922a4e4beb8544c10e246b764097048328ec20e
 2016-04-26 15:43:30 +00:00
TreeHugger Robot
d8998a48c9 Merge "Frameworks/base: Make debug helper lazy in ConnectivityManager" into nyc-dev am: 396c590 
am: 12aea50

* commit '12aea502c103777317d6105f59365384034ced8a':
  Frameworks/base: Make debug helper lazy in ConnectivityManager

Change-Id: Ifc6094201f1c92b92465010ab6f965d7946ec0e7
 2016-04-26 15:34:26 +00:00
Julia Reynolds
a0676c9207 Merge changes from topic 'api_review' into nyc-dev 
* changes:
  Api review: Settings.
  Reduce spacing.
 2016-04-26 15:29:11 +00:00
TreeHugger Robot
396c590c42 Merge "Frameworks/base: Make debug helper lazy in ConnectivityManager" into nyc-dev 2016-04-26 15:25:44 +00:00
David Brazdil
9ada71dccf Merge "Change app selection policy for post-OTA verification" into nyc-dev 
am: 3eaf72d

* commit '3eaf72dc67ef0911bee0cc0d1db088cb70b044ca':
  Change app selection policy for post-OTA verification

Change-Id: I00ece6027cd8ae3cb513e361853136d7d314adf8
 2016-04-26 12:27:30 +00:00
David Brazdil
3eaf72dc67 Merge "Change app selection policy for post-OTA verification" into nyc-dev 2016-04-26 12:22:16 +00:00
Narayan Kamath
3ec2508c99 LoadedApk: Don\'t set up JIT profile support inside the system_server. 
am: 2d4a222

* commit '2d4a222de157c693b16ca2b35a264dd92ae6abee':
  LoadedApk: Don't set up JIT profile support inside the system_server.

Change-Id: I52d0cb275f3d01a094aefed65e43a2882d00679c
 2016-04-26 12:18:52 +00:00
Narayan Kamath
2d4a222de1 LoadedApk: Don't set up JIT profile support inside the system_server. 
We shouldn't profile *any* packages loaded by the system_server, not
just the system_servers own ("android") package.

bug: 28241500
Change-Id: I5f3f477b40c758030a5bdc8e97d17cab6e68e204
 2016-04-26 12:08:23 +00:00
David Brazdil
90e269917e Change app selection policy for post-OTA verification 
Changes the policy for selecting packages which will be pre-verified
during post-OTA boot animation.

For Nx to Ny, an app is pre-verified if used in the foreground in the
last 7 days, or if its APK was loaded by other apps.

For M to N (or early N builds without detailed stats), an app is
pre-verified if it has any recorded use in the last 7 days.

Bug: 27902702
Bug: 27350503
Change-Id: I2b38daf017ecd0e5aa5ed596ed9351cffa03dbcb
 2016-04-26 12:51:53 +01:00
Hui Shu
b5829cdf11 Merge "WebView downgrade prevention logic" into nyc-dev 
am: e12d62b

* commit 'e12d62bd79d27f1719ac6db01b1dd53289fe03d4':
  WebView downgrade prevention logic

Change-Id: I9d67d612696078b647eef9ac575da0e47e08eab4
 2016-04-26 09:35:36 +00:00
TreeHugger Robot
e12d62bd79 Merge "WebView downgrade prevention logic" into nyc-dev 2016-04-26 09:31:57 +00:00
Jaewan Kim
0f360d80ad Merge "PIP: Send KEYCODE_WINDOW to app first if PIP isn\'t exist" into nyc-dev 
am: bdc4700

* commit 'bdc4700155f5ff89e213cb0e9efe49897b888f7d':
  PIP: Send KEYCODE_WINDOW to app first if PIP isn't exist

Change-Id: Ic77538cac9562acf878c7c56f443a691e9d0b45f
 2016-04-26 06:08:59 +00:00
Jaewan Kim
bdc4700155 Merge "PIP: Send KEYCODE_WINDOW to app first if PIP isn't exist" into nyc-dev 2016-04-26 06:03:01 +00:00
Jaewan Kim
f0fd218382 PIP: Send KEYCODE_WINDOW to app first if PIP isn't exist 
Bug: 27954955
Change-Id: I517e378d5c1672ac0eb87bdf4375b7d733276e58
 2016-04-26 13:06:21 +09:00
Lorenzo Colitti
35ffc550dd Merge "Merge "When dumping connectivity metrics events, print data as well." into nyc-dev am: e4860f0 am: 8711593" into nyc-mr1-dev-plus-aosp 
am: 05b4399

* commit '05b4399242ae4759143c7ca3bd72565c1bbee74e':
  When dumping connectivity metrics events, print data as well.

Change-Id: I094e96703fba00a24ce90670b3966ebc9f5e392d
 2016-04-26 03:58:41 +00:00
Lorenzo Colitti
87115932c5 Merge "When dumping connectivity metrics events, print data as well." into nyc-dev 
am: e4860f0

* commit 'e4860f02564e887918192f733a29f04552f83414':
  When dumping connectivity metrics events, print data as well.

Change-Id: I63c0b56f9f54e0df794b3061e310c702f638b857
 2016-04-26 03:28:34 +00:00
Lorenzo Colitti
e4860f0256 Merge "When dumping connectivity metrics events, print data as well." into nyc-dev 2016-04-26 03:22:26 +00:00
Jeff Sharkey
bee17df836 Merge "Track down Contexts without data directories." into nyc-dev am: 3a10c1e am: 3bf4cd1 
am: 47e625c

* commit '47e625c64c811d8a373784e0172b2eb8ed60c70a':
  Track down Contexts without data directories.

Change-Id: I2897b5a85ca276b28fe2eb4c02ea679cb2344317
 2016-04-25 23:34:35 +00:00
Alex Light
2f46f70798 Merge "Make fake libart for misbehaving apps be loaded." into nyc-dev am: 57413a7 am: 7ad3001 
am: 6534e16

* commit '6534e16cf73005baaf9ed7c537b030ca1c67aa9f':
  Make fake libart for misbehaving apps be loaded.

Change-Id: If20e1dad4170e0b9cf007a5bcd7420762deb0664
 2016-04-25 23:04:11 +00:00
Jeff Sharkey
3bf4cd1fb5 Merge "Track down Contexts without data directories." into nyc-dev 
am: 3a10c1e

* commit '3a10c1e86db9843462660d825a9673a3c72ccdd6':
  Track down Contexts without data directories.

Change-Id: Id6934369489b8a60e8d6ceb3de8f7774c5128ed6
 2016-04-25 22:57:37 +00:00
Jeff Sharkey
596e8588b1 resolve merge conflicts of d1153a3 to master 
Change-Id: Iec9a4a76d0db0fbebdca8a732b4666cfaad70267
 2016-04-25 16:40:38 -06:00
Alex Light
7ad3001399 Merge "Make fake libart for misbehaving apps be loaded." into nyc-dev 
am: 57413a7

* commit '57413a74777060d9368f89966e9abcf96e33af8e':
  Make fake libart for misbehaving apps be loaded.

Change-Id: Iba15cda4cda9968dbe303919427ad192bb940f46
 2016-04-25 22:04:53 +00:00
Jeff Sharkey
3a10c1e86d Merge "Track down Contexts without data directories." into nyc-dev 2016-04-25 21:59:41 +00:00
Jeff Sharkey
5df7298c59 resolve merge conflicts of c79a568 to nyc-dev-plus-aosp 
Change-Id: I3ee02bc596f285fa41ffcafa882ae5997ef67d22
 2016-04-25 15:53:50 -06:00
TreeHugger Robot
57413a7477 Merge "Make fake libart for misbehaving apps be loaded." into nyc-dev 2016-04-25 21:53:31 +00:00
Jeff Sharkey
79014856cc resolve merge conflicts of 59ad404 to nyc-mr1-dev-plus-aosp 
Change-Id: I65f892594034c6de4ac17459c01e146fe4c4e377
 2016-04-25 15:52:11 -06:00
Kweku Adams
78502626ae Merge "Removing extraneous field from batterystats dumpsys." into nyc-dev am: 3cabb2a am: 6c0291c 
am: 5a3350b

* commit '5a3350b65c95ecb4c3252c07f1d6450dbd6a3071':
  Removing extraneous field from batterystats dumpsys.

Change-Id: Ied21cfa884915e8008bd32add81f38cf4baf26e5
 2016-04-25 21:50:55 +00:00
Dan Sandler
0551b0f42a resolve merge conflicts of c635525 to master 
Change-Id: I33b31ce36bbf255408ac50b87ed29f3957c9d533
 2016-04-25 17:32:50 -04:00
Kweku Adams
6c0291c144 Merge "Removing extraneous field from batterystats dumpsys." into nyc-dev 
am: 3cabb2a

* commit '3cabb2a6b3ae1c120a56cc4c2eaf2ba853cb3e32':
  Removing extraneous field from batterystats dumpsys.

Change-Id: I8568d44fb0af02b8096fd48c832d424ef4d41aee
 2016-04-25 20:46:08 +00:00
Jeff Sharkey
c79a568f18 Merge "API changes for DownloadManager and JobScheduler." into nyc-dev 2016-04-25 20:14:59 +00:00
Kweku Adams
3cabb2a6b3 Merge "Removing extraneous field from batterystats dumpsys." into nyc-dev 2016-04-25 20:09:41 +00:00
Dan Sandler
5bab149bce Merge changes from topic \'substitute-notification-app-name\' into nyc-dev 
am: 955009f

* commit '955009f9d384d1b19ebb441814ca0a3fac0fbc47':
  Move EXTRA_SUBSTITUTE_APP_NAME to the published system api.
  Show "Android System" instead of "System UI" in screenshot notifications.

Change-Id: I709f92bda6edd41abd8b22bbee2d4c887cb8dc1c
 2016-04-25 19:34:48 +00:00
Daniel Sandler
955009f9d3 Merge changes from topic 'substitute-notification-app-name' into nyc-dev 
* changes:
  Move EXTRA_SUBSTITUTE_APP_NAME to the published system api.
  Show "Android System" instead of "System UI" in screenshot notifications.
 2016-04-25 19:22:40 +00:00
Jeff Sharkey
24492ae448 Track down Contexts without data directories. 
Data directories for all packages should be created and managed by
installd; if we create a Context and the data directory doesn't exist
yet, we're in trouble, since a later mkdirs() would end up creating
the directory with incorrect permissions, mode, and SELinux labels.

Bug: 28272737
Change-Id: Ie3bb884ab07748719378de5c792046a031a3f945
 2016-04-25 13:20:29 -06:00
Julia Reynolds
0aa7d615c2 Api review: Settings. 
Hide notification policy setting.

Bug: 28295513
Change-Id: Ic117285c3eb07cb4bf399e233adad835772b9673
 2016-04-25 14:57:33 -04:00
Bo Liu
8a68ab45a5 Merge "WebView doc: explain persist js across navigations" into nyc-dev am: b698fc9 am: d61776e 
am: c144e2b

* commit 'c144e2b599c262d327d74c0d7f1a8e929097f508':
  WebView doc: explain persist js across navigations

Change-Id: I44d0cd7fa79454ddd31c4f394696534d0e735bbb
 2016-04-25 18:57:13 +00:00
TreeHugger Robot
c144e2b599 Merge "WebView doc: explain persist js across navigations" into nyc-dev am: b698fc9 
am: d61776e

* commit 'd61776e18e7497571e94d640945c224cc5e4fc71':
  WebView doc: explain persist js across navigations

Change-Id: I51ff498cc69cd6a88df14cd425f80f062a5edffd
 2016-04-25 18:51:56 +00:00
Bo Liu
0374048e2d Merge "WebView doc: explain persist js across navigations" into nyc-dev 
am: b698fc9

* commit 'b698fc9d84cff493ce34dd9860f14f34ce48e8f0':
  WebView doc: explain persist js across navigations

Change-Id: I87b81e624c7fc44ad316dc287d8a7332312860af
 2016-04-25 18:46:51 +00:00
TreeHugger Robot
b698fc9d84 Merge "WebView doc: explain persist js across navigations" into nyc-dev 2016-04-25 18:39:47 +00:00
Kweku Adams
5b2747e133 Removing extraneous field from batterystats dumpsys. 
Accidentally introduced in ag/851920.

Change-Id: I89ac490cef1735defa7165e6d27beae20490091d
 2016-04-25 10:44:05 -07:00
Calin Juravle
720898fd88 Merge "Disable StrictMode policy when setting up profile support" into nyc-dev am: 096e2dc am: 3a61c96 
am: 64804b7

* commit '64804b759156abf7f2979a8151020faff9d026dc':
  Disable StrictMode policy when setting up profile support

Change-Id: I239978da3183b412c01a98026a260daf50e6f84c
 2016-04-25 17:37:29 +00:00
Andreas Gampe
3480213054 Frameworks/base: Make debug helper lazy in ConnectivityManager 
Place helper map for callback field names into a holder. This avoids
the reflective calls in static initialization of ConnectivityManager
in the common (non-debug) case, which means the class can be
compile-time initialized. Also saves the storage necessary (both
the storage array as well as the reflection metadata).

Follow-up to fcfa7d921a.

Bug: 27265238
Change-Id: Ib4bfaf27acd234a035a5d198458340099a156a4c
 2016-04-25 10:30:53 -07:00
TreeHugger Robot
64804b7591 Merge "Disable StrictMode policy when setting up profile support" into nyc-dev am: 096e2dc 
am: 3a61c96

* commit '3a61c96d29b5fed0fbb4d234c46589c4763b0e11':
  Disable StrictMode policy when setting up profile support

Change-Id: Ia35d5a8e5d4b86f1524c9dd69216123772ee761d
 2016-04-25 17:26:40 +00:00
Calin Juravle
2797c1234a Merge "Disable StrictMode policy when setting up profile support" into nyc-dev 
am: 096e2dc

* commit '096e2dcf855714577bb86eaa4869ff46b5980a07':
  Disable StrictMode policy when setting up profile support

Change-Id: I430da856430046c5e2751232b427505962615b33
 2016-04-25 17:16:37 +00:00