Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
246,497 Commits 3 Branches 0 Tags
ffe7746437e8f06cc7dd2571c3354973791c8a8a
Commit Graph

246497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
221c6e6db7 Merge "Fix ClipData JavaDoc and behavior that contradicts JavaDoc" into nyc-dev 2016-05-04 17:07:13 +00:00
Steve McKay
1d8b98bdd3 Merge "Disable share when dirs selected." into nyc-dev 
am: 3fff306827

* commit '3fff306827c6fe998f8569d71ea18da597eb5a85':
  Disable share when dirs selected.

Change-Id: I2dbe0e2081580b5096a60657b5dc35536dc8f873
 2016-05-04 17:05:28 +00:00
Vladislav Kaznacheev
9d17528e7c Merge "Collect mime type data correctly for all URIs added to ClipData" into nyc-dev 
am: e06ef946f4

* commit 'e06ef946f4f86e11f9a8ed5abe216ef7b76aebf0':
  Collect mime type data correctly for all URIs added to ClipData

Change-Id: I6f50e3c880cf7ae6f67f6571cdabe6d68cc1f7c1
 2016-05-04 17:05:25 +00:00
Pavel Zhamaitsiak
be3e539ff7 Merge "Fix race condition in MetricsLoggerService" into nyc-dev 2016-05-04 17:02:18 +00:00
Robin Lee
0dc591b48d Disallow suspending the default dialer 
This is the only case that still had to be protected by priv-app, so
that check is removed at the same time.

Bug: 27635033
Change-Id: Ifd5e59ab56eb45f0651cb25882ead920c758ae51
 2016-05-04 16:49:15 +00:00
Steve McKay
3fff306827 Merge "Disable share when dirs selected." into nyc-dev 2016-05-04 16:46:30 +00:00
Robin Lee
323f29df58 Start VPN as early as possible during startup 
- Switch from USER_STARTING to USER_STARTED which is the foreground
  version of the broadcast

- Set the new VPN network as CONNECTING initially to avoid spamming
  apps with useless notifications ahead of the network being fully
  available

Bug: 26694104
Fix: 28335277
Change-Id: I31d5260dda62ff440c31c44eb0aa5c891e2717e5
 2016-05-04 17:46:10 +01:00
TreeHugger Robot
e06ef946f4 Merge "Collect mime type data correctly for all URIs added to ClipData" into nyc-dev 2016-05-04 16:41:08 +00:00
Robin Lee
585e248894 Split network agent created state from connected state 
Network creation setup sometimes involves extra steps after actually
calling into netd to create the underlying network, rules & routes &
to begin allowing sockets bound to it.

For example, VPN networks can set a UID whitelist or blacklist. This
should happen:

  - AFTER there is a netID & network created in netd as
    network-specific rules will need to be tied to / point at it. Those
    rules are tied to the lifecycle of netd's network which is tracked
    by `NetworkAgentInfo.created` on the frameworks side.

  - BEFORE the CONNECTED broadcast and network callbacks have been sent
    out so that we don't create a race condition between clients that
    want to use the network and the server actually having the network
    ready

The race condition existed prior to this change and required any client
making use of network callbacks to sleep for a short amount of time after
receiving to actually be able to use the network.

Among other things, that race condition is now fixed.

Bug: 26694104
Change-Id: Ied92f5588a98c3e97f456bc98b676bf201ab5472
 2016-05-04 16:24:46 +00:00
Jason Monk
8e73ef37c9 Fix QS crash with RTL rotate 
Set the adapter after changes because we do some weird stuff in
the way pages are generated.

Change-Id: I8fd2cda3ad7e4e523731f1ba8628b661cf8a7a69
Fixes: 28317442
 2016-05-04 11:44:07 -04:00
Baligh Uddin
13788ba7de Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 5282bb5ee7  -s ours

* commit '5282bb5ee71aa22cd9b943994e7af773730acbed':
  Import translations. DO NOT MERGE

Change-Id: I724eef86f050bdd1f8ee9ba9ba1c8d2c302267c2
 2016-05-04 14:04:14 +00:00
Baligh Uddin
5fa6b666b4 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: ce7d13e9e6  -s ours

* commit 'ce7d13e9e69a886f3cd5117cc4060a38885b5d10':
  Import translations. DO NOT MERGE

Change-Id: I4ca603cdefb3c97bc2544d0e36da7b39453cc2b5
 2016-05-04 14:04:10 +00:00
Baligh Uddin
a1f6199fb9 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 2799ff8a4b  -s ours

* commit '2799ff8a4b88a7f61978bc186259009915b42b29':
  Import translations. DO NOT MERGE

Change-Id: Iea3ea6f375f87f0879577155226a8cb4df9da844
 2016-05-04 14:04:06 +00:00
Baligh Uddin
f437362f42 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 151a7bb502  -s ours

* commit '151a7bb5020a46144d618a30624916eb58446517':
  Import translations. DO NOT MERGE

Change-Id: I62cd8e2442fd1ed650685eb1c230535982eb22a4
 2016-05-04 14:04:01 +00:00
Baligh Uddin
5282bb5ee7 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-04 13:45:13 +00:00
Baligh Uddin
ce7d13e9e6 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-04 13:45:09 +00:00
Baligh Uddin
2799ff8a4b Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-04 13:42:31 +00:00
Baligh Uddin
151a7bb502 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-04 13:42:17 +00:00
Felipe Leme
e3f016fb4e Merge "Don\'t display 1st-time dialog when disabling Data Saver." into nyc-dev 
am: b5cc6af44f

* commit 'b5cc6af44ff69200c1693975c76d094bd46adb69':
  Don't display 1st-time dialog when disabling Data Saver.

Change-Id: I22204829f07d4f430d48b243f3db53c454c2d50e
 2016-05-04 13:37:29 +00:00
Julia Reynolds
617a7804bb Uncheck unselected radio buttons. 
Fixes: 28518097
Change-Id: I22cce7837802a97f15af4170f8991db1685ee121
 2016-05-04 09:31:56 -04:00
TreeHugger Robot
b5cc6af44f Merge "Don't display 1st-time dialog when disabling Data Saver." into nyc-dev 2016-05-04 13:24:13 +00:00
Tim Volodine
aea7696e20 Merge "[WebView] Update ServiceWorker related documentation." into nyc-dev 
am: 42791eca7d

* commit '42791eca7dd70a077bca554b708c65794afdde92':
  [WebView] Update ServiceWorker related documentation.

Change-Id: I81d317326997b1d550206fa6a0303bb98ef53e56
 2016-05-04 12:52:11 +00:00
TreeHugger Robot
42791eca7d Merge "[WebView] Update ServiceWorker related documentation." into nyc-dev 2016-05-04 12:37:21 +00:00
Ricky Wai
b79fedc929 Merge "Do not show exception stack trace when no child profile key" into nyc-dev 
am: 3423a513e7

* commit '3423a513e7c0c0a0a7ae0fada1fc684c990c0aa2':
  Do not show exception stack trace when no child profile key

Change-Id: I0ef58126daa4ed3ea3e683aecda677c21ee00786
 2016-05-04 10:59:49 +00:00
Ricky Wai
3423a513e7 Merge "Do not show exception stack trace when no child profile key" into nyc-dev 2016-05-04 10:47:55 +00:00
Ricky Wai
5a76ee9cd5 Merge "Make notification reply can response to work challenge" into nyc-dev 
am: 92d0e9a4ed

* commit '92d0e9a4ede2c1b8132d9d980d1e51b2e5558ffb':
  Make notification reply can response to work challenge

Change-Id: Ie684a58e8598bcaf9763d282f7624ce81817d6d8
 2016-05-04 10:41:38 +00:00
Tony Mak
012d7426c2 New settings key and policy transparency for managed profile settings 
am: c820cc5fb1

* commit 'c820cc5fb1eb036e76d60a25f151cbd91485feb3':
  New settings key and policy transparency for managed profile settings

Change-Id: Idac0d1357d77c4d740f3978f36e1e56224f66f0b
 2016-05-04 10:41:15 +00:00
Ricky Wai
92d0e9a4ed Merge "Make notification reply can response to work challenge" into nyc-dev 2016-05-04 10:11:21 +00:00
Ricky Wai
de3a068af6 Do not show exception stack trace when no child profile key 
Bug: 28396912
Change-Id: I48e3f3223d04a0ba3dd2d975901b0504ce0dd25f
 2016-05-04 10:09:50 +00:00
Tony Mak
c820cc5fb1 New settings key and policy transparency for managed profile settings 
Bug: 28281560
Change-Id: I38d0c202088df410a28e78800de4e74377ec3216
 2016-05-04 09:33:08 +00:00
Baligh Uddin
a7558df310 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 28463229
Change-Id: Ic96e78c740e77efbccaee8718e981d6fb9a1da58
 2016-05-04 00:06:46 -07:00
Baligh Uddin
7fd9b8c578 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 28463229
Change-Id: Ia8bad7599bc6c36fd2d28e3e1b223ab64c6981ba
 2016-05-03 23:29:06 -07:00
Baligh Uddin
3a5ffb25d7 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 28463229
Change-Id: If0b1247f6f525c6db0dddb5fa591d7c46bb2fbf0
 2016-05-03 23:15:27 -07:00
Baligh Uddin
a90acec632 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 28463229
Change-Id: I0bd21ace6a871d1e74ce5a670acf2f0ed30c12fe
 2016-05-03 23:07:15 -07:00
Jeff Sharkey
5db0c62474 Merge "Check permission for FLAG_WILL_BE_FOREGROUND." into nyc-dev 
am: 564915c58e

* commit '564915c58e30a1849386f1a77559a461b9f681f4':
  Check permission for FLAG_WILL_BE_FOREGROUND.

Change-Id: Id9666e2ce5b61d566f3581b1a02bfd27905883a8
 2016-05-04 03:47:36 +00:00
TreeHugger Robot
564915c58e Merge "Check permission for FLAG_WILL_BE_FOREGROUND." into nyc-dev 2016-05-04 03:39:29 +00:00
Jeff Sharkey
e4a8483b3b Merge "Avoid restart when inserting/ejecting adopted." into nyc-dev 
am: c8cc38c8c5

* commit 'c8cc38c8c56770dd3ff2a7e2fbb3267c6a9a14d0':
  Avoid restart when inserting/ejecting adopted.

Change-Id: If2d05f0f06f76a4df6a2ca476abb5c78095f774f
 2016-05-04 02:08:03 +00:00
TreeHugger Robot
c8cc38c8c5 Merge "Avoid restart when inserting/ejecting adopted." into nyc-dev 2016-05-04 02:02:39 +00:00
Jim Miller
d197486f26 Send FINGERPRINT_ERROR_LOCKOUT on some devices 
For devices that don't support hardware lockout, send
FINGERPRINT_ERROR_LOCKOUT after the last unsuccessful
authentication attempt.

Fixes bug 28346640

Change-Id: Iae3eb8e422f09100a0229c350df9983af5fd8762
 2016-05-03 18:35:18 -07:00
smain@google.com
732c9e0e80 redirect removed file from cl: https://critique.corp.google.com/#review/121079434 am: 3548f40a28 am: e77eefbe29 am: ad6af19b1b 
am: 623620651a

* commit '623620651ab8fb55898e8af0c499343a427ba6fd':
  redirect removed file from cl: https://critique.corp.google.com/#review/121079434

Change-Id: I7e443489c278549bd06e07c35b0e04a63bc0de78
 2016-05-04 01:30:07 +00:00
smain@google.com
623620651a redirect removed file from cl: https://critique.corp.google.com/#review/121079434 am: 3548f40a28 am: e77eefbe29 
am: ad6af19b1b

* commit 'ad6af19b1b99a9cd5b8f2db6010532f19d38aae2':
  redirect removed file from cl: https://critique.corp.google.com/#review/121079434

Change-Id: Id5ce56f0686ae76278017872ed3ea4b7a7632734
 2016-05-04 01:27:39 +00:00
smain@google.com
ad6af19b1b redirect removed file from cl: https://critique.corp.google.com/#review/121079434 am: 3548f40a28 
am: e77eefbe29

* commit 'e77eefbe29908d6500c56fc3090be94e097bbb1c':
  redirect removed file from cl: https://critique.corp.google.com/#review/121079434

Change-Id: If29e3ccf695010de01fa50f1a09733b663c9b506
 2016-05-04 01:25:01 +00:00
smain@google.com
e77eefbe29 redirect removed file from cl: https://critique.corp.google.com/#review/121079434 
am: 3548f40a28

* commit '3548f40a28722750dc581414f329b6741502fb6a':
  redirect removed file from cl: https://critique.corp.google.com/#review/121079434

Change-Id: I232156f7f32292eea6bbbf995921234048d1ca91
 2016-05-04 01:22:25 +00:00
smain@google.com
3548f40a28 redirect removed file from cl: 
https://critique.corp.google.com/#review/121079434

Change-Id: I5629c3142167e79875d930a272977c4f527203e6
 2016-05-03 18:14:06 -07:00
Chris Craik
13fe3b4e12 Merge "Use LUT for computing final shadow alpha" into nyc-dev 
am: b2e36d7939

* commit 'b2e36d7939610de538a6ec95a821b61b365b3073':
  Use LUT for computing final shadow alpha

Change-Id: Id29a67b235ccdc48f610c3e4ebbcf62e5cc1590a
 2016-05-04 01:11:10 +00:00
TreeHugger Robot
b2e36d7939 Merge "Use LUT for computing final shadow alpha" into nyc-dev 2016-05-04 01:03:42 +00:00
destradaa
8eba91a5d1 Merge "Update verbosity of hardware providers." into nyc-dev 
am: 976b9b04e4

* commit '976b9b04e4b38c3be2f91d6955e53874ad52cb10':
  Update verbosity of hardware providers.

Change-Id: I20c151713e75a714006cb849d86de9d417eafe9c
 2016-05-04 00:48:58 +00:00
Steve McKay
080efafe1f Finish selection mode after copyto and share... 
actions are picked by user.
Bug: 27601508

Change-Id: I32cbc8e8eb4abba4161309327d5ce730610193ad
 2016-05-03 17:48:22 -07:00
Jaewan Kim
30e2bc887f Merge "Fix documentation for drawable resource" into mnc-docs am: 2d542c5558 am: d3eacb56b6 am: 7179b0b52f am: 3c523f65a8 
am: cda3cab8dd

* commit 'cda3cab8dd35f802e8d0ded415545123e5444b38':
  Fix documentation for drawable resource

Change-Id: I3512746c54f294342cd5ad9d3c34675d4ef3a23a
 2016-05-04 00:39:01 +00:00
Daniel Estrada Alva
976b9b04e4 Merge "Update verbosity of hardware providers." into nyc-dev 2016-05-04 00:38:06 +00:00