Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
247,164 Commits 3 Branches 0 Tags
19f003e14aa18b9709712fb565fb8eb4059f5846
Commit Graph

58792 Commits

Author SHA1 Message Date
Michael Wright
19f003e14a Merge "Crash early when requesting a keyboard shortcut helper..." into nyc-dev am: 52546e4 
am: f58d81e

* commit 'f58d81e640ac2d471259838af986b410f5cd2938':
  Crash early when requesting a keyboard shortcut helper...

Change-Id: I2ef9f779a6295d90e9654738317ea39cd4f10870
 2016-04-13 14:06:18 +00:00
Michael Wright
f58d81e640 Merge "Crash early when requesting a keyboard shortcut helper..." into nyc-dev 
am: 52546e4

* commit '52546e46353f455d6a5bd070da6095868d7fc8bd':
  Crash early when requesting a keyboard shortcut helper...

Change-Id: Ia1be80e54af4c04af0c33ef2d03f7fc4e8dfee84
 2016-04-13 14:02:50 +00:00
Michael Wright
52546e4635 Merge "Crash early when requesting a keyboard shortcut helper..." into nyc-dev 2016-04-13 13:58:16 +00:00
Michal Karpinski
dc8ac6fbb5 Merge "API polish in DPM for organization color and name methods" into nyc-dev am: 1271cef 
am: 96d49b1

* commit '96d49b1ac6e197f64103e5454e308f65609b2853':
  API polish in DPM for organization color and name methods

Change-Id: I90b74fa1b0c3e2961fb26fc5e84e85d5bc5da1f5
 2016-04-13 13:40:03 +00:00
Michal Karpinski
96d49b1ac6 Merge "API polish in DPM for organization color and name methods" into nyc-dev 
am: 1271cef

* commit '1271cef419bdb7577f64b1dfa05d5678df706ef5':
  API polish in DPM for organization color and name methods

Change-Id: I6073662932fc256fc4860a19c4d45b1f9fcf9ced
 2016-04-13 13:36:44 +00:00
Michal Karpinski
1271cef419 Merge "API polish in DPM for organization color and name methods" into nyc-dev 2016-04-13 13:28:08 +00:00
Victor Chang
8a7ecc06aa Merge "Update display text in cert notification" into nyc-dev am: caf566a 
am: b2d7079

* commit 'b2d707953aceb1ec8e1935d9744816dd3c9b20b5':
  Update display text in cert notification

Change-Id: I6b27877b6932e484ce847c656ea02c1dc982f59c
 2016-04-13 10:25:43 +00:00
Victor Chang
b2d707953a Merge "Update display text in cert notification" into nyc-dev 
am: caf566a

* commit 'caf566a5372b05230885b787997b98ff4508eadd':
  Update display text in cert notification

Change-Id: I8c7459972fbdd2224f8eb68d01c7c63061b2256e
 2016-04-13 10:22:27 +00:00
Victor Chang
caf566a537 Merge "Update display text in cert notification" into nyc-dev 2016-04-13 10:15:29 +00:00
Yohei Yukawa
75997c59ea Merge "Improve captalization in InputMethodSubtype#getDisplayName()." into nyc-dev am: d0fae0d 
am: bf0cf9d

* commit 'bf0cf9d1357cd7fc153ae23ada488698f42c4009':
  Improve captalization in InputMethodSubtype#getDisplayName().

Change-Id: I4ac4f87b62faea8811fb364a7c19e0f155ca631f
 2016-04-13 07:00:06 +00:00
Yohei Yukawa
bf0cf9d135 Merge "Improve captalization in InputMethodSubtype#getDisplayName()." into nyc-dev 
am: d0fae0d

* commit 'd0fae0d61d22608b4bfb0845e13ed9c07c5c5376':
  Improve captalization in InputMethodSubtype#getDisplayName().

Change-Id: Ifcbc689552b616482d236e88a512242d54704c20
 2016-04-13 06:57:05 +00:00
Yohei Yukawa
d0fae0d61d Merge "Improve captalization in InputMethodSubtype#getDisplayName()." into nyc-dev 2016-04-13 06:51:34 +00:00
Pierre Imai
a3f8b53893 Merge "Fix a memory leak in ConnectivityManager." into nyc-dev am: 11a888f 
am: e235da5

* commit 'e235da5d5cb1db440db228ee23314617e7dd9aa4':
  Fix a memory leak in ConnectivityManager.

Change-Id: I713b4d68033aaac4ef2ada50a486538459814e77
 2016-04-13 06:44:29 +00:00
Pierre Imai
e235da5d5c Merge "Fix a memory leak in ConnectivityManager." into nyc-dev 
am: 11a888f

* commit '11a888faafc0e8181c782b9b945332d57b00e38e':
  Fix a memory leak in ConnectivityManager.

Change-Id: I46160bd5070779641607d65ec5d234d65f039d6b
 2016-04-13 06:41:18 +00:00
Pierre Imai
11a888faaf Merge "Fix a memory leak in ConnectivityManager." into nyc-dev 2016-04-13 06:37:33 +00:00
Yohei Yukawa
e489baf96d Improve captalization in InputMethodSubtype#getDisplayName(). 
The goal of this CL is to enable
InputMethodSubtype#getLocaleDisplayName() to return more natural locale
display name in terms of capitalization rules.

The key idea here is to use LocaleDisplayNames#localeDisplayName() with
an appropriate DisplayContext.CAPITALIZATION_FOR_* parameter rather than
relying on Locale#getDisplayName().

Bug: 22845728
Change-Id: If105082ce703db7a86738455db7e9fb37f3c6fe8
 2016-04-13 05:30:23 +00:00
Seigo Nonaka
98950ad961 Merge "Delete CR LF at the same time with one backspace key." into nyc-dev am: 363a288 
am: 01f868a

* commit '01f868aa25f7d64ee82be3feb22b6535c588660d':
  Delete CR LF at the same time with one backspace key.

Change-Id: I11d32074b1091d2c8fd79aa683692a93e54b297f
 2016-04-13 05:22:49 +00:00
Seigo Nonaka
01f868aa25 Merge "Delete CR LF at the same time with one backspace key." into nyc-dev 
am: 363a288

* commit '363a2884c99714547e684b42c59d9ff5de49851f':
  Delete CR LF at the same time with one backspace key.

Change-Id: I7e8471f7899a253a53f918ef75bf5a7e3a3bdc67
 2016-04-13 05:19:51 +00:00
Seigo Nonaka
363a2884c9 Merge "Delete CR LF at the same time with one backspace key." into nyc-dev 2016-04-13 05:14:25 +00:00
TreeHugger Robot
a1cdc96faa Merge "TRON refinements for multi-window" into nyc-dev am: a74888d 
am: e203cde

* commit 'e203cdefa1cc34057230ad83fdc5ef172e96f080':
  TRON refinements for multi-window

Change-Id: I2edd0f1e9b851234c21e42cd2e22e127a155e21f
 2016-04-13 04:28:59 +00:00
Jorim Jaggi
e203cdefa1 Merge "TRON refinements for multi-window" into nyc-dev 
am: a74888d

* commit 'a74888ddf6657b41aed28dff0b0b1d47a80f107f':
  TRON refinements for multi-window

Change-Id: I8a1a6d26bc94eca1afde2a1de920b4a39cd5e7f9
 2016-04-13 04:26:04 +00:00
TreeHugger Robot
a74888ddf6 Merge "TRON refinements for multi-window" into nyc-dev 2016-04-13 04:18:31 +00:00
TreeHugger Robot
1aa27fccb7 Merge "Added api to delete cache files for a given user" into nyc-dev am: 0a6a6db 
am: 7b13098

* commit '7b13098b6299530348c836266d74369b0ff0b3d4':
  Added api to delete cache files for a given user

Change-Id: I4a2c3d4137e2f48bf3e57c3a54c0ed5e573ed66e
 2016-04-13 03:20:27 +00:00
Suprabh Shukla
7b13098b62 Merge "Added api to delete cache files for a given user" into nyc-dev 
am: 0a6a6db

* commit '0a6a6dbe9107a3e31d74293f853b46ae0e5b9e7b':
  Added api to delete cache files for a given user

Change-Id: If8bc5327e76680d3d30127b1129e7c4c36928421
 2016-04-13 03:17:24 +00:00
TreeHugger Robot
0a6a6dbe91 Merge "Added api to delete cache files for a given user" into nyc-dev 2016-04-13 03:13:49 +00:00
Jorim Jaggi
29379ec859 TRON refinements for multi-window 
Bug: 26013430
Change-Id: I89b139b4ca3e7b6a06d8b5b351d67ffac240f73f
 2016-04-12 19:43:52 -07:00
Jorim Jaggi
b82c55b38e Merge "Add shadow for minimized dock" into nyc-dev am: a5df489 
am: fae3f9c

* commit 'fae3f9c5e51bbcd2ab3eab49d4a7aaf06fe88a41':
  Add shadow for minimized dock

Change-Id: I4a41197c569635235ae254892db9a7272eb154a3
 2016-04-13 02:37:38 +00:00
Jorim Jaggi
fae3f9c5e5 Merge "Add shadow for minimized dock" into nyc-dev 
am: a5df489

* commit 'a5df489c9c56b1ac5b0f1acef07454ea438b5367':
  Add shadow for minimized dock

Change-Id: Iab5e97a8a5cb521aadf519359816ff2c48de7e71
 2016-04-13 02:33:39 +00:00
Jorim Jaggi
a5df489c9c Merge "Add shadow for minimized dock" into nyc-dev 2016-04-13 02:24:57 +00:00
Jorim Jaggi
2917dc4918 Add shadow for minimized dock 
Bug: 27972642
Change-Id: Ic4c8145f61694ff2bb0e237da1142093c6a4d965
 2016-04-12 19:17:24 -07:00
Paul Jensen
45dd59b0f1 Merge "If Internet probe is redirected, pass redirect destination to NetworkAgent." into nyc-dev am: 3e6a6fc 
am: 2c1f03a

* commit '2c1f03ade023a61428b7d9101bc10e4c88ae941a':
  If Internet probe is redirected, pass redirect destination to NetworkAgent.

Change-Id: I4c5f5cb8591d8729de9036a6c2aabacd4aba0f39
 2016-04-13 02:02:13 +00:00
TreeHugger Robot
d1e516f071 Merge "Fix broken actions with MessagingStyle" into nyc-dev am: 4ecc0ce 
am: 36feadc

* commit '36feadc46c7a25a6fffe07d3187803fd72b88b5e':
  Fix broken actions with MessagingStyle

Change-Id: I192757a1ca04ad32bcd0eb8fbac47e2a381b3f96
 2016-04-13 02:01:32 +00:00
TreeHugger Robot
b707e4623e Merge "Set label for links to resolver activities." into nyc-dev am: d1b8d6d 
am: d516393

* commit 'd5163938650510a3f77ee42ef448550d426380b2':
  Set label for links to resolver activities.

Change-Id: If2e6eced61f1521ead8e37999f97659731ce72fa
 2016-04-13 02:00:50 +00:00
Eino-Ville Talvala
552781c9c0 Merge "Camera/Surface: Update OutputConfiguration API" into nyc-dev am: 777c4e7 
am: d848ebb

* commit 'd848ebb7a5930a8ad6c93efd2b8b0ccf2116a664':
  Camera/Surface: Update OutputConfiguration API

Change-Id: I10d13c49771baea1968d79a5359deaaca1697e5d
 2016-04-13 02:00:38 +00:00
Jeff Sharkey
45630fc0d3 Merge "Fix broken javadoc." into nyc-dev am: cadfc77 
am: f58879a

* commit 'f58879ac196662ea39b91d44179b2a0e86a52c4d':
  Fix broken javadoc.

Change-Id: I55e96a9ee2c735a0ff2b1254520d843b4ca13eeb
 2016-04-13 01:59:58 +00:00
Paul Jensen
2c1f03ade0 Merge "If Internet probe is redirected, pass redirect destination to NetworkAgent." into nyc-dev 
am: 3e6a6fc

* commit '3e6a6fc60ea78994298ff38cfe7230faf24fe6b7':
  If Internet probe is redirected, pass redirect destination to NetworkAgent.

Change-Id: I4a88bca105b1fceb7dc823b8a26991235944d405
 2016-04-13 01:41:05 +00:00
Paul Jensen
3e6a6fc60e Merge "If Internet probe is redirected, pass redirect destination to NetworkAgent." into nyc-dev 2016-04-13 01:33:37 +00:00
Suprabh Shukla
78c9eb8947 Added api to delete cache files for a given user 
Added an api to delete application cache files for a specific user. This
allows settings to clear cache files for work profile apps as well.

Bug: b/25338468
Change-Id: I52d4944a7a03b6d63ad44dd6bb868aec62815eab
 2016-04-12 18:23:56 -07:00
Adrian Roos
36feadc46c Merge "Fix broken actions with MessagingStyle" into nyc-dev 
am: 4ecc0ce

* commit '4ecc0ce387195c44f5737d5b155c0dd1ea00add7':
  Fix broken actions with MessagingStyle

Change-Id: I9cdff69b8931564190217bc0bfe4396954c4efa5
 2016-04-13 01:02:18 +00:00
TreeHugger Robot
4ecc0ce387 Merge "Fix broken actions with MessagingStyle" into nyc-dev 2016-04-13 00:54:32 +00:00
Philip P. Moltmann
d516393865 Merge "Set label for links to resolver activities." into nyc-dev 
am: d1b8d6d

* commit 'd1b8d6d342d049e00d9a304c291c6c024aa3c0a0':
  Set label for links to resolver activities.

Change-Id: Iaf7e59bdca4a25b347661bed7b927b8100dcac96
 2016-04-13 00:17:54 +00:00
Eino-Ville Talvala
d848ebb7a5 Merge "Camera/Surface: Update OutputConfiguration API" into nyc-dev 
am: 777c4e7

* commit '777c4e764462ec43e29e0366bd1203f9be9e5ded':
  Camera/Surface: Update OutputConfiguration API

Change-Id: I68cbc5100ecb766f9018cbbc751ca456727c6909
 2016-04-13 00:12:48 +00:00
TreeHugger Robot
d1b8d6d342 Merge "Set label for links to resolver activities." into nyc-dev 2016-04-13 00:12:39 +00:00
Eino-Ville Talvala
777c4e7644 Merge "Camera/Surface: Update OutputConfiguration API" into nyc-dev 2016-04-13 00:08:09 +00:00
Jeff Sharkey
f58879ac19 Merge "Fix broken javadoc." into nyc-dev 
am: cadfc77

* commit 'cadfc77d0355ef57308ef1bf8bf43560d2b2e245':
  Fix broken javadoc.

Change-Id: I2ccd28ea9b50f8e7573e18565e665b2b82c1a410
 2016-04-12 23:42:24 +00:00
Michael Wright
53b854ad7d Crash early when requesting a keyboard shortcut helper... 
with a null IResultReceiver.

We're seeing Dialer crashes in this code path but they happen in the
main Handler loop so we can't see where the request with the null
request is coming from. Crashing earlier will hopefully give us a
stack trace that we can use to diagnose the issue.

Bug: 27963013
Change-Id: I60e4ef2ef328fa69790bbcaa4f196c02f7443296
 2016-04-12 19:39:03 -04:00
Jeff Sharkey
cadfc77d03 Merge "Fix broken javadoc." into nyc-dev 2016-04-12 23:37:38 +00:00
Makoto Onuki
a9a8d44cdc Merge "ShortcutManager: Address API review feedback." into nyc-dev am: 1d616f0 
am: 9d25ead

* commit '9d25ead98b6b09611fd95dfdd2b49ef5191ea030':
  ShortcutManager: Address API review feedback.

Change-Id: I663034ac1ae3bdb7b0757efae0396235784b8dce
 2016-04-12 23:07:29 +00:00
Makoto Onuki
9d25ead98b Merge "ShortcutManager: Address API review feedback." into nyc-dev 
am: 1d616f0

* commit '1d616f0d880d0a4109e811221f3c3ff2e016013b':
  ShortcutManager: Address API review feedback.

Change-Id: I83cf33d390ba695117b88b397667e378902f439e
 2016-04-12 22:52:26 +00:00
Philip P. Moltmann
f8173ca8ac Set label for links to resolver activities. 
Also: Add specific labels for capture-image-intent.

Fixes: 20134921
Change-Id: I3678def1089512a8340f19110645a03379c26cee
 2016-04-12 15:44:00 -07:00