Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
250,056 Commits 3 Branches 0 Tags
001ccdc98fe78be3240fd52f0b060f5827aa492b
Commit Graph

59321 Commits

Author SHA1 Message Date
Robert Carr
001ccdc98f Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev am: 37696cccd8 am: ff54c9eeb2 
am: e42b3f0586

* commit 'e42b3f0586b5055eeb1e77c4b5d52001fcff9c90':
  Respect manually set HARDWARE_ACCELERATED flag.

Change-Id: I84acd6bb147dded75314aa97e21dc8d9446fd43a
 2016-04-21 20:08:18 +00:00
Rob Carr
e42b3f0586 Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev am: 37696cccd8 
am: ff54c9eeb2

* commit 'ff54c9eeb2eeebebcb8d14fd35dfcdcbafa187a6':
  Respect manually set HARDWARE_ACCELERATED flag.

Change-Id: Ie0530121ee8dc34ae41f89acb27eeaf41ddf3534
 2016-04-21 20:03:34 +00:00
Rob Carr
37696cccd8 Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev 2016-04-21 19:52:02 +00:00
Kirill Grouchnikov
c17c387603 Merge "@TestApi method to get display value for current selection" 2016-04-21 19:25:10 +00:00
Yohei Yukawa
028333feaf Merge "Accept null subtype in InputMethodSubtypeHandle." into nyc-dev am: d67a1ca49b am: 1f79c0fea1 
am: 1241d67eff

* commit '1241d67eff7cf0fd20be4fca7c1a63c3679c541c':
  Accept null subtype in InputMethodSubtypeHandle.

Change-Id: I811104dab27ac95c401a88d5ef8b82e9a45eb9f2
 2016-04-21 17:20:55 +00:00
Yohei Yukawa
1f79c0fea1 Merge "Accept null subtype in InputMethodSubtypeHandle." into nyc-dev 
am: d67a1ca49b

* commit 'd67a1ca49b138056d53490322ffdadef61d95fec':
  Accept null subtype in InputMethodSubtypeHandle.

Change-Id: I8eb560fa0176836894164a9e7856d44bd0b91a09
 2016-04-21 17:16:19 +00:00
Yohei Yukawa
d67a1ca49b Merge "Accept null subtype in InputMethodSubtypeHandle." into nyc-dev 2016-04-21 17:11:55 +00:00
Tony Mak
c65e3e8331 Merge "Fix wrong app is launched after solving challenge from tapping notification" into nyc-dev am: d3589ee715 am: f5f982f014 
am: b9362cf633

* commit 'b9362cf6332ee99042e6630c163babca04769aca':
  Fix wrong app is launched after solving challenge from tapping notification

Change-Id: I1ae8d5399470e449947d3ecf57285d39145d0a1e
 2016-04-21 16:00:57 +00:00
Tony Mak
f5f982f014 Merge "Fix wrong app is launched after solving challenge from tapping notification" into nyc-dev 
am: d3589ee715

* commit 'd3589ee715e397e61025265adc883c9ed3be4f56':
  Fix wrong app is launched after solving challenge from tapping notification

Change-Id: Id0e6e3cbc8cbea4e87625f479eb0d83dbf22266e
 2016-04-21 15:53:57 +00:00
Tony Mak
646fe9913e Fix wrong app is launched after solving challenge from tapping notification 
PendingIntent.FLAG_ONE_SHOT is needed to prevent the PendingIntent being
reused.

Also, flag and activity option of credential intent in BaseStatusBar
is not same as the one in ActivityStarter. Added a new
function startConfirmDeviceCredentialIntent in AM to centralize it.

Change-Id: I2d9e5923ad5d4d012f10057c409c666c8ca299a3
Fix: 28309964
 2016-04-21 16:43:08 +01:00
Erik Kline
8124d17dfc Merge "Expand NetworkMonitor metrics" into nyc-dev am: b99d6af3ab am: 0f155c5778 
am: 9d73518433

* commit '9d7351843349945be98a712a2cfa27b85b57c72a':
  Expand NetworkMonitor metrics

Change-Id: I5ae6a60c774386f60cdb1a390ae7f9fac3f0d300
 2016-04-21 05:32:59 +00:00
Erik Kline
0f155c5778 Merge "Expand NetworkMonitor metrics" into nyc-dev 
am: b99d6af3ab

* commit 'b99d6af3ab406db14d161cdc0000ed521957d7ca':
  Expand NetworkMonitor metrics

Change-Id: I1d5475b998b6e29ad8bf43f8e457d9f4db85527a
 2016-04-21 05:28:30 +00:00
TreeHugger Robot
b99d6af3ab Merge "Expand NetworkMonitor metrics" into nyc-dev 2016-04-21 05:24:40 +00:00
Hugo Benichi
a27a918e03 Merge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de am: eb8372d38c 
am: 51d6d7ad5e

* commit '51d6d7ad5e866e7201c4d843a497b78f8a0607f8':
  Some fixes in ConnectivityService event logging

Change-Id: Icb50bdab260da6476c1d1148fa2d8995b106a809
 2016-04-21 04:19:53 +00:00
Hugo Benichi
51d6d7ad5e Merge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de 
am: eb8372d38c

* commit 'eb8372d38c31af196285d2fee60ae53adb113eca':
  Some fixes in ConnectivityService event logging

Change-Id: Ie356b2df2b84b36e6a2a52d3246ff434557ee89b
 2016-04-21 04:15:10 +00:00
Hugo Benichi
9fc5843fa8 Merge "Some fixes in ConnectivityService event logging" into nyc-dev 
am: 7261fb27de

* commit '7261fb27de16bb6d3ebd81bd3b73062bd212ea7e':
  Some fixes in ConnectivityService event logging

Change-Id: I0ca861a1d35eb6cdb5490d04a725d64465eebc31
 2016-04-21 04:12:56 +00:00
Hugo Benichi
dced5552ef Merge "Various fixes in IpReachability event logging" into nyc-dev am: 75f0346167 am: d8a8ea1e29 
am: c3795b94a3

* commit 'c3795b94a3d48a5184d13cea43a02aebcd31bb48':
  Various fixes in IpReachability event logging

Change-Id: I5b25861f1010ac008c3cafc51a720b42cb961fba
 2016-04-21 04:08:25 +00:00
Hugo Benichi
d8a8ea1e29 Merge "Various fixes in IpReachability event logging" into nyc-dev 
am: 75f0346167

* commit '75f0346167f9b8beb8d4b941e7a4ca8228e0737a':
  Various fixes in IpReachability event logging

Change-Id: Ibfea132ad824990464e4d488a717d34bd027b891
 2016-04-21 04:04:01 +00:00
Hugo Benichi
7261fb27de Merge "Some fixes in ConnectivityService event logging" into nyc-dev 2016-04-21 04:02:55 +00:00
Erik Kline
a488c23dd5 Expand NetworkMonitor metrics 
- add netid to CaptivePortalStateChangeEvent
    - add NetworkMonitorEvent for simple duration measurements

Bug: 28204408
Change-Id: I62035e07d64013878a0bce30c67c929c2c7e7a85
 2016-04-21 13:02:55 +09:00
Hugo Benichi
75f0346167 Merge "Various fixes in IpReachability event logging" into nyc-dev 2016-04-21 03:54:18 +00:00
Ruchi Kandoi
a30439d6cd Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev am: 316c68f144 am: fb8c76df29 
am: cd3e0f594f

* commit 'cd3e0f594f8097e09094373e5e57e5b82d70624c':
  fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link

Change-Id: I53785eb2d1326ef1f59814b6cc489429619962c3
 2016-04-21 02:57:25 +00:00
Ruchi Kandoi
fb8c76df29 Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev 
am: 316c68f144

* commit '316c68f144946a3019cc8f314921e8588c766b71':
  fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link

Change-Id: If4cc351b8674343cbb83e22bcfccf9e7b4d00484
 2016-04-21 02:46:51 +00:00
Ruchi Kandoi
316c68f144 Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev 2016-04-21 02:37:50 +00:00
Amith Yamasani
7f6e30dfdf Merge "Throw better exception when startVoiceActivity fails" into nyc-dev am: 2be4c463bc am: bc25c87c57 
am: 13b566915b

* commit '13b566915b31d4ef1537bc5d4460da88074fc7a6':
  Throw better exception when startVoiceActivity fails

Change-Id: I41471adc060db774ed6d7e71819613b3691b85b3
 2016-04-21 02:33:46 +00:00
Shreyas Basarge
9dabe94fb6 Merge "Fix logspam by JobInfo" into nyc-dev am: bb9dd3c9fd am: f153182db7 
am: b8408d8eb7

* commit 'b8408d8eb755da42db3cf25868920d5b583b77ca':
  Fix logspam by JobInfo

Change-Id: I7bc166a3353b2a3d29719744d4f006662f738d8f
 2016-04-21 02:32:12 +00:00
Philip P. Moltmann
c383eea86a Merge "Prevent printing from finishing activity." into nyc-dev am: 41304f47f4 am: a9c65ffb00 
am: 7db07e5731

* commit '7db07e57318c74291b6ec84f48a5df09acd688ec':
  Prevent printing from finishing activity.

Change-Id: Ibbe7d4f14e109c51fbd239b1998f8f0f580a8ed8
 2016-04-21 02:27:03 +00:00
Philip P. Moltmann
3ae0b0afac Merge "Print API for N: Fix docs and change interfaces as requested." into nyc-dev am: 50a871857d am: a70594be57 
am: 8a7f60095b

* commit '8a7f60095b3b6efa4c6ca30a806dbe7752ef5661':
  Print API for N: Fix docs and change interfaces as requested.

Change-Id: I254333882dbec52948045d71978b9d7d015822cc
 2016-04-21 02:19:08 +00:00
Vladislav Kaznacheev
32c8b330df Merge "Add JavaDoc for View.updateDragShadow" into nyc-dev am: 2860936 am: 1a5cc60b39 
am: 24d1f99711

* commit '24d1f997115c8e114900bd2306e4e11a0c05e35f':
  Add JavaDoc for View.updateDragShadow

Change-Id: I7fc6a1b8403687329dd217c09781ccc1887bc331
 2016-04-21 02:10:02 +00:00
Eino-Ville Talvala
a7d12c80c5 Merge "Camera2: Ignore exception on double-completed capture sequences." into nyc-dev am: 5856779 am: 896a1a42f7 
am: 4006ef1d6f

* commit '4006ef1d6f1d6952995fb06fe226b6eed90bf89a':
  Camera2: Ignore exception on double-completed capture sequences.

Change-Id: I7434e3ff65958466ce6624ba8dffd2e47a07ca11
 2016-04-21 02:05:58 +00:00
Hugo Benichi
5f16f760ad Some fixes in ConnectivityService event logging 
Bug: 28204408
Change-Id: I44ed9539bb213a845c2bcc2861c947af7c3c9ef4
 2016-04-21 11:03:08 +09:00
Amith Yamasani
bc25c87c57 Merge "Throw better exception when startVoiceActivity fails" into nyc-dev 
am: 2be4c463bc

* commit '2be4c463bc6411cf6fb9e2a4be0cbb90c485d0de':
  Throw better exception when startVoiceActivity fails

Change-Id: Ie8dfd6ed1f366e24418f352c810281ca687c70fb
 2016-04-21 00:50:10 +00:00
Shreyas Basarge
f153182db7 Merge "Fix logspam by JobInfo" into nyc-dev 
am: bb9dd3c9fd

* commit 'bb9dd3c9fdef30ed4bf776fbf8cb74c7eed2e87e':
  Fix logspam by JobInfo

Change-Id: I58ec5ed68dad8df8c5f73c3e313181c36f0d27dd
 2016-04-21 00:50:04 +00:00
TreeHugger Robot
2be4c463bc Merge "Throw better exception when startVoiceActivity fails" into nyc-dev 2016-04-21 00:46:32 +00:00
Dianne Hackborn
bb9dd3c9fd Merge "Fix logspam by JobInfo" into nyc-dev 2016-04-21 00:39:43 +00:00
Adam Lesinski
0144ca2371 Merge "Doze settings example not matching real keys" am: 570a13f am: 790699d am: 2988b8f6 
am: 466e03e86b

* commit '466e03e86b7f17b4fcfcefda2e9f8e3921463663':
  Doze settings example not matching real keys

Change-Id: I8f1b1e290097b953efa681ee5ad3ec6a46105631
 2016-04-21 00:38:26 +00:00
Philip P. Moltmann
7db07e5731 Merge "Prevent printing from finishing activity." into nyc-dev am: 41304f47f4 
am: a9c65ffb00

* commit 'a9c65ffb003c8c00667f9ec0d3d7efd28c334b6c':
  Prevent printing from finishing activity.

Change-Id: I8f3263acd7323f6cb7804c75b2cd877768963ada
 2016-04-21 00:37:22 +00:00
Adam Lesinski
604a0a9fc2 Merge "ResourcesManager: Throw exception if failed to load asset path" into nyc-dev am: 1362ae0 am: 40c6118 
am: fc2de302f4

* commit 'fc2de302f484cb95cf2b15e5976324996f5a3882':
  ResourcesManager: Throw exception if failed to load asset path

Change-Id: I9fb7f2df3d37cb4ba6cb8fa9e3fc10a7999c6e36
 2016-04-21 00:36:36 +00:00
Philip P. Moltmann
458216854a Merge "Prevent printing from finishing activity." into nyc-dev 
am: 41304f47f4

* commit '41304f47f4d5d6cdd4d160c9553f47b1e641aff8':
  Prevent printing from finishing activity.

Change-Id: Ia3de45edab34f91a0da0f0474c8e870f3f132e45
 2016-04-21 00:34:36 +00:00
Philip P. Moltmann
41304f47f4 Merge "Prevent printing from finishing activity." into nyc-dev 2016-04-21 00:31:42 +00:00
Christopher Tate
57fe3eea85 Merge "Don\'t back up wallpapers that we\'ve been told not to" into nyc-dev am: 665189f am: 9e92c03 
am: cdfe208a99

* commit 'cdfe208a99906b4157305ea0c4af06d2e303d830':
  Don't back up wallpapers that we've been told not to

Change-Id: I45e4c3c47e371c3808e5669e2c7af6d8405edb7a
 2016-04-21 00:24:55 +00:00
Jim Miller
aa453ebd70 Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev am: 54c4374 am: 5480783 
am: eabb274ace

* commit 'eabb274ace1c6dbf73bbb95b1100d01a2e445f4e':
  Fix bug where fingerprint for wrong userId was attempted to be removed.

Change-Id: I3a62ec2f591f7ec7c7f40a01f8a70848c9805945
 2016-04-21 00:23:36 +00:00
Philip P. Moltmann
a70594be57 Merge "Print API for N: Fix docs and change interfaces as requested." into nyc-dev 
am: 50a871857d

* commit '50a871857d4a6c6f8d6ce8b3621414e60a32eaf6':
  Print API for N: Fix docs and change interfaces as requested.

Change-Id: Id9b2b228001802d6b5325e6b01d318e265541441
 2016-04-21 00:23:34 +00:00
Ruchi Kandoi
a2689dcf71 fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link 
Change-Id: Ic12b98cbafcc8c81eadba119ab416a9eddb7214a
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
 2016-04-20 17:22:27 -07:00
Ruchi Kandoi
a2b96b1c8c Merge "Revert "PowerManager: Adds the Sustained performance API."" into nyc-dev am: 0fea8ad am: 4c24df5 
am: d84169a92f

* commit 'd84169a92ffe2137a7e53c2debcde42cf2eb1878':
  Revert "PowerManager: Adds the Sustained performance API."

Change-Id: Iadb804137b77b1fd9f20da6b03c2b8e30617ed0c
 2016-04-21 00:21:51 +00:00
Hugo Benichi
25bf8f5d56 Various fixes in IpReachability event logging 
- fold IpReachabilityMonitor* classes into a single IpReachabilityEvent.
- only log an event for NUD_FAILED Netlink answers.
- distinguish between NUD_FAILED with or without lost of provisioning.
- do not record host ip addresses.
- record interface name instead of interface index when losing
  provisioning.

- also return an error code when probeNeighbor fails, and log this error
  code in IpReachability events.

Bug: 28204408
Change-Id: I5f0def0ab1ace7e467a0c69b3b82d07ef2252307
 2016-04-21 09:18:50 +09:00
Vladislav Kaznacheev
bd048c598d Merge "Add JavaDoc for View.updateDragShadow" into nyc-dev 
am: 28609360cf

* commit '28609360cfe25446ab5b0ba165af363378b3d805':
  Add JavaDoc for View.updateDragShadow

Change-Id: I2d5488d78f4095cdfa3558dc0a4e3a785c420648
 2016-04-21 00:18:20 +00:00
Eino-Ville Talvala
a6587338ea Merge "Camera2: Ignore exception on double-completed capture sequences." into nyc-dev 
am: 5856779c3a

* commit '5856779c3a3e00e256cdf5cb571a85975d781cf4':
  Camera2: Ignore exception on double-completed capture sequences.

Change-Id: I7905d6ef70ba031736fcc2cea9f1ffdabe09851e
 2016-04-21 00:17:55 +00:00
Philip P. Moltmann
50a871857d Merge "Print API for N: Fix docs and change interfaces as requested." into nyc-dev 2016-04-21 00:17:48 +00:00
Vladislav Kaznacheev
24d1f99711 Merge "Add JavaDoc for View.updateDragShadow" into nyc-dev am: 2860936 
am: 1a5cc60b39

* commit '1a5cc60b3968d54b9c7bf4e6883b3b4ca55821ca':
  Add JavaDoc for View.updateDragShadow

Change-Id: I07bfcff42ea12ae0260c850012d936121b3d3ea6
 2016-04-21 00:17:45 +00:00