Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cheryl Potter
0529ad5606 docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592 am: d1da82f616 am: 06c815fc74 am: d45800d2e3 am: 3e9304127e am: 9b9049a373 
am: b335d10539

* commit 'b335d10539fdc889ad5b7b78fbcd3e26bca47140':
  docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592

Change-Id: I177f23901204cb71c4578449ce68dc5138da81b9
 2016-05-18 15:36:21 +00:00
Android Build Merger (Role)
d06f4a56fd Merge "docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592 am: d1da82f616 am: 06c815fc74 am: d45800d2e3 am: 3e9304127e am: a663282036" into nyc-mr1-dev-plus-aosp 2016-05-18 15:33:11 +00:00
Robert Sesek
ffc715b8f5 Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev 
am: f45bc095c6

* commit 'f45bc095c6cef916f5f801fb320b3413f0fc099a':
  Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE.

Change-Id: I5306ff5f4e9abe6161616873e752cf4d54ed6408
 2016-05-18 15:32:54 +00:00
Philip P. Moltmann
0ba575e431 Merge "Handle printers selected by SelectPrinter activity" into nyc-dev 
am: 746de4e9c8

* commit '746de4e9c87d3068643a97a3b0b5709ffdbb4ad6':
  Handle printers selected by SelectPrinter activity

Change-Id: I5060133e2dd3a87f99af3ecc3e1b378291befcc4
 2016-05-18 15:32:48 +00:00
Cheryl Potter
e82d94b585 docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592 am: d1da82f616 am: 06c815fc74 am: d45800d2e3 am: 3e9304127e 
am: a663282036

* commit 'a663282036f956df8d81847418b056d0a72c0b4e':
  docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592

Change-Id: I73fce8632c5e8268114882181d1537708be557a8
 2016-05-18 15:32:45 +00:00
Cheryl Potter
b335d10539 docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592 am: d1da82f616 am: 06c815fc74 am: d45800d2e3 am: 3e9304127e 
am: 9b9049a373

* commit '9b9049a37349e5de804e3550f7a8c5f802dc2569':
  docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592

Change-Id: If4779d18b21fea7c028b7dd4cf2d937c5b93c399
 2016-05-18 15:32:19 +00:00
Robert Sesek
a83b4cfc74 Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev 
am: f45bc095c6

* commit 'f45bc095c6cef916f5f801fb320b3413f0fc099a':
  Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE.

Change-Id: Ie16d11c4aaa515a570b8b717241d556903198d24
 2016-05-18 15:32:18 +00:00
Philip P. Moltmann
8e5c3a004a Merge "Handle printers selected by SelectPrinter activity" into nyc-dev 
am: 746de4e9c8

* commit '746de4e9c87d3068643a97a3b0b5709ffdbb4ad6':
  Handle printers selected by SelectPrinter activity

Change-Id: Ie22f3d5d2b483a8a6354cb9968e939a80b6b1855
 2016-05-18 15:32:15 +00:00
Cheryl Potter
9b9049a373 docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592 am: d1da82f616 am: 06c815fc74 am: d45800d2e3 
am: 3e9304127e

* commit '3e9304127e7b59d66aff50f406a270e23c8cb208':
  docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592

Change-Id: I6092edde07d9feb87def206f5fc2f6e0ebae875a
 2016-05-18 15:28:01 +00:00
Cheryl Potter
a663282036 docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592 am: d1da82f616 am: 06c815fc74 am: d45800d2e3 
am: 3e9304127e

* commit '3e9304127e7b59d66aff50f406a270e23c8cb208':
  docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592

Change-Id: I21df6a1f604d5b67ef136f45fccfc6ba8746da5e
 2016-05-18 15:28:00 +00:00
Philip P. Moltmann
e951a13916 Declare no print services if 0 print services are enabled. 
Fixes: 28833953
Change-Id: I94e77dc23107fab10d45f51169d71e4da574ee66
 2016-05-18 08:27:02 -07:00
Philip P. Moltmann
3704b11ff9 Move add-printer list headers to the right positions. 
Fixes: 28833479
Change-Id: I0ab955e1a1625e9638da5a76584af988a9f6c342
 2016-05-18 08:26:21 -07:00
Robert Sesek
f45bc095c6 Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev 2016-05-18 15:25:41 +00:00
Michael Wright
491b8d1452 Merge changes from topic \'bad-attr-buildfix\' into nyc-dev am: 7e91ec88ef am: 8b0faef1a2 
am: 621c5064e0

* commit '621c5064e03b631c9bc2effeb264c26203f42624':

Change-Id: I413d8d7c9186161dcde3ed2a57781f53a09e8695
 2016-05-18 15:24:32 +00:00
Michael Wright
069d0a1c75 Merge changes from topic \'bad-attr-buildfix\' into nyc-dev am: 7e91ec88ef am: f205245cf4 
am: 9e89ba4406

* commit '9e89ba44062b1f754c9d50f4df853c5795eff592':
  Fix attr link in support lib docs.
  Revert "Revert "docs: Creating new support library revision history page""

Change-Id: I4d237e35282acafed03f89aac984bd6fde566707
 2016-05-18 15:24:28 +00:00
Narayan Kamath
804ec7d8ec Merge "PackageManager: Fix reference profile canonicalization." into nyc-dev am: 9f33e5cccc am: 16d3fae494 
am: bd3a80f345

* commit 'bd3a80f3453dc1a1ced2b6a5d5982c2403188129':

Change-Id: Ic78ab59b356c17359ebedfc22c24e9c64620f5b1
 2016-05-18 15:24:23 +00:00
Philip P. Moltmann
746de4e9c8 Merge "Handle printers selected by SelectPrinter activity" into nyc-dev 2016-05-18 15:24:21 +00:00
Narayan Kamath
be1ea88ec3 Merge "PackageManager: Fix reference profile canonicalization." into nyc-dev am: 9f33e5cccc am: 34d9a8c333 
am: 44ff7748d9

* commit '44ff7748d9701a58c8e402e32794a4538a15a51b':
  PackageManager: Fix reference profile canonicalization.

Change-Id: If7166572d245d779ee60224ddf7e4e910e547acb
 2016-05-18 15:24:16 +00:00
Julia Reynolds
4b99d54538 Merge "resolve merge conflicts of 0ca33e8 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp 
am: 6ab41b2a07

* commit '6ab41b2a07cc742cd528c515e518876f5a834e8c':

Change-Id: I80b68924a5155ece5cb13daeced56b5d4443a0a3
 2016-05-18 15:24:08 +00:00
Toni Barzic
c5b143781c Merge "Handle PhoneStatusBarPolicy user switch callbacks on main thread" into nyc-dev am: 5201a6246d am: 0ca33e84a1 
am: a0163ef396

* commit 'a0163ef396d3ea34435fa4dbde7cb2d98d4f2103':

Change-Id: Ieb61cefec3b1a747967e55866159fd1ba62e66e9
 2016-05-18 15:24:00 +00:00
Cheryl Potter
3e9304127e docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592 am: d1da82f616 am: 06c815fc74 
am: d45800d2e3

* commit 'd45800d2e31550520dd6f3210b309ae3abaa4471':
  docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592

Change-Id: Id7298a4811e157030f51646618b600a13a65ad77
 2016-05-18 15:22:34 +00:00
Michael Wright
621c5064e0 Merge changes from topic \'bad-attr-buildfix\' into nyc-dev am: 7e91ec88ef 
am: 8b0faef1a2

* commit '8b0faef1a2093e41965d175dc9781d92d57ef5f9':

Change-Id: I7238050eb1a0df58b8f1f715258e65f57d783849
 2016-05-18 15:20:23 +00:00
Michael Wright
9e89ba4406 Merge changes from topic \'bad-attr-buildfix\' into nyc-dev am: 7e91ec88ef 
am: f205245cf4

* commit 'f205245cf4b3aa90681917614da160104541ff5f':
  Fix attr link in support lib docs.
  Revert "Revert "docs: Creating new support library revision history page""

Change-Id: I92c2bcd4514d0414431f1c25cd7658f44cd8afd1
 2016-05-18 15:18:18 +00:00
Narayan Kamath
bd3a80f345 Merge "PackageManager: Fix reference profile canonicalization." into nyc-dev am: 9f33e5cccc 
am: 16d3fae494

* commit '16d3fae49449c8f0411f2cfc8323a86b0c965aa1':

Change-Id: I36667bf0d4f61f59607365c4a6d80817bc2634de
 2016-05-18 15:18:07 +00:00
Cheryl Potter
d45800d2e3 docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592 am: d1da82f616 
am: 06c815fc74

* commit '06c815fc74de27e7ca053f81c8972e268810de13':
  docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592

Change-Id: I9597dba7e1f5c13c88dc1f3d2ba516418d679260
 2016-05-18 15:17:44 +00:00
Michael Wright
8b0faef1a2 Merge changes from topic \'bad-attr-buildfix\' into nyc-dev 
am: 7e91ec88ef

* commit '7e91ec88ef61343345defe58ea968228b10d003a':
  Fix attr link in support lib docs.
  Revert "Revert "docs: Creating new support library revision history page""

Change-Id: I21b98fdba0187d4c941d93d67c14e4cf74842729
 2016-05-18 15:16:34 +00:00
Narayan Kamath
44ff7748d9 Merge "PackageManager: Fix reference profile canonicalization." into nyc-dev am: 9f33e5cccc 
am: 34d9a8c333

* commit '34d9a8c3335d1def24d1437d7c3c6cdd567dc9fe':
  PackageManager: Fix reference profile canonicalization.

Change-Id: I47d10820fbefbf1d176e0744408c076ababf32b1
 2016-05-18 15:15:38 +00:00
Alex Light
0a72ba7d3f Make fake libart for misbehaving apps be loaded. 
Bug: 27775991
Change-Id: Ie4eba211e876ec0643ce6ecf6a110f3cb5e0f57e
(cherry picked from commit 20ed24fc0c)
 2016-05-18 08:14:34 -07:00
Michael Wright
f205245cf4 Merge changes from topic \'bad-attr-buildfix\' into nyc-dev 
am: 7e91ec88ef

* commit '7e91ec88ef61343345defe58ea968228b10d003a':
  Fix attr link in support lib docs.
  Revert "Revert "docs: Creating new support library revision history page""

Change-Id: Ie2bdbbb96678a1e5cf6fe5e21d722335749cd7f7
 2016-05-18 15:13:13 +00:00
Narayan Kamath
16d3fae494 Merge "PackageManager: Fix reference profile canonicalization." into nyc-dev 
am: 9f33e5cccc

* commit '9f33e5cccc8816ed8d41716eb172ec28b9935946':
  PackageManager: Fix reference profile canonicalization.

Change-Id: I089272599a7d03b6e4b210cf5cc2c38a5659eeeb
 2016-05-18 15:13:10 +00:00
Cheryl Potter
06c815fc74 docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592 
am: d1da82f616

* commit 'd1da82f61614388c181ccbc9d4de2cfb6522c071':
  docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592

Change-Id: I0c2acc2d5204d34c177b534d7dd4b5ae5200f98f
 2016-05-18 15:11:54 +00:00
Narayan Kamath
34d9a8c333 Merge "PackageManager: Fix reference profile canonicalization." into nyc-dev 
am: 9f33e5cccc

* commit '9f33e5cccc8816ed8d41716eb172ec28b9935946':
  PackageManager: Fix reference profile canonicalization.

Change-Id: Id19a0107733ce3eb53d879e4cc13027dbd509a4f
 2016-05-18 15:09:30 +00:00
Michael Wright
7e91ec88ef Merge changes from topic 'bad-attr-buildfix' into nyc-dev 
* changes:
  Fix attr link in support lib docs.
  Revert "Revert "docs: Creating new support library revision history page""
 2016-05-18 15:07:37 +00:00
Narayan Kamath
9f33e5cccc Merge "PackageManager: Fix reference profile canonicalization." into nyc-dev 2016-05-18 15:04:19 +00:00
Michael Wright
ae316f8424 Fix attr link in support lib docs. 
It accidentally pointed to the media router resources rather than the
app compat ones.

Change-Id: Ie15bd056ebf939270dfcd45dda56946ed41b56f0
 2016-05-18 15:58:39 +01:00
TreeHugger Robot
6ab41b2a07 Merge "resolve merge conflicts of 0ca33e8 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp 2016-05-18 14:52:47 +00:00
Julia Reynolds
0b3d3f277b resolve merge conflicts of 43153f1 to master 
Change-Id: I1d1957abf5c97565d2a1c52c5f50c6a25b711bd7
 2016-05-18 10:49:02 -04:00
Clara Bayarri
c17a5988e3 Add Tron Logging to Keyboard Shortcuts Helper 
Bug: 28161718
Change-Id: I5dcbb4c9f26d133e695595168ac2cd0ad1fa68d7
 2016-05-18 15:39:24 +01:00
Svet Ganov
2265fddba6 Hide ephemeral API 
bug:28825660

Change-Id: I4e9cdd6e29df44a173136aed13c4039443d944cc
 2016-05-18 07:38:29 -07:00
Julia Reynolds
a0163ef396 Merge "Handle PhoneStatusBarPolicy user switch callbacks on main thread" into nyc-dev am: 5201a6246d 
am: 0ca33e84a1

* commit '0ca33e84a146218e801f653dcc1e194dd9fb0ed5':

Change-Id: Ifaace8487a13a4ac21dccdee229427c05cdae9d5
 2016-05-18 14:34:45 +00:00
Julia Reynolds
c1168df3e9 resolve merge conflicts of 0ca33e8 to nyc-mr1-dev-plus-aosp 
Change-Id: I363b70a22a000b4cc94381b31f0ef7053f5518eb
 2016-05-18 10:32:51 -04:00
Julia Reynolds
43153f18c5 resolve merge conflicts of 5201a62 to nyc-dev-plus-aosp 
am: cc8c594a5c

* commit 'cc8c594a5c5cb255907cb2eaddb37ea1321fa104':
  Handle PhoneStatusBarPolicy user switch callbacks on main thread

Change-Id: I816905527f5061e7af2fe14b42f9c0397036bdb7
 2016-05-18 14:31:03 +00:00
Michael Wright
9363b31196 Revert "Revert "docs: Creating new support library revision history page"" 
This reverts commit 982fd04335.
 2016-05-18 15:24:36 +01:00
Julia Reynolds
cc8c594a5c resolve merge conflicts of 5201a62 to nyc-dev-plus-aosp 
Change-Id: I411ed02c96997416dc5e5eb4f289d3c25932babd
 2016-05-18 10:24:28 -04:00
Toni Barzic
0ca33e84a1 Merge "Handle PhoneStatusBarPolicy user switch callbacks on main thread" into nyc-dev 
am: 5201a6246d

* commit '5201a6246d12830d0bb766d59e22b0320f2f99dc':
  Handle PhoneStatusBarPolicy user switch callbacks on main thread

Change-Id: I561be9cf58d0a43abd43d98cf1ee717241f10ef1
 2016-05-18 14:16:01 +00:00
Julia Reynolds
5201a6246d Merge "Handle PhoneStatusBarPolicy user switch callbacks on main thread" into nyc-dev 2016-05-18 14:09:50 +00:00
Clara Bayarri
382c59edb2 Fix Backslash not showing with paired keyboard 
Our current label retrieving flow is

1. Special cased drawables (e.g. backspace)
2. Special cased names (e.g. F2)
3. Device KeyCharacterMap getLabel

For single character keys such as '\', we reach the end of 3. with
no result if the main device doesn't have the key. This change uses
the virtual keyboard map as a backup to retrieve labels for these
last resort cases.

Bug: 28830189
Change-Id: I69cc82a11e7b803db7f60ea07d34c59f6000149e
 2016-05-18 15:02:10 +01:00
Narayan Kamath
6d99f79671 PackageManager: Fix reference profile canonicalization. 
Foreign dex markers are named in the runtime by calling realpath(3) on the input
dexfile path and replacing "/" with "@". On the Java side, we're using
File.getCanonicalPath, which is similar but isn't quite the same. It tries
to call realpath() directly, but if that fails, it resorts to a series of
increasingly desperate measures to calculate a "canonical path". We just
use realpath instead.

Also, don't attempt to delete a profile if canonicalization fails.

bug: 28740848
Change-Id: Ie5d5af590187e793db633342a42b923865e5c005
 2016-05-18 12:33:56 +00:00
Neil Fuller
2be22e0d85 Merge "Add support for ICU data pinning in the Zygote" am: 9b1d64410d am: 8491b4c05d am: c724f2207f 
am: a90127dcc8

* commit 'a90127dcc8b5d1b9a7eb7a1c1d5eed9c87eb36ed':
  Add support for ICU data pinning in the Zygote

Change-Id: I444be1abe083b84a7d411f87ff9a6865e96344ff
 2016-05-18 12:03:12 +00:00
Neil Fuller
a90127dcc8 Merge "Add support for ICU data pinning in the Zygote" am: 9b1d64410d am: 8491b4c05d 
am: c724f2207f

* commit 'c724f2207f9186f25eeac5b2131e469dafb3bc90':
  Add support for ICU data pinning in the Zygote

Change-Id: I2c14d6dad84ed2bf5d6186ab795d54184bb483cb
 2016-05-18 12:00:34 +00:00