Commit Graph

16005 Commits

Author SHA1 Message Date
Fyodor Kupolov
1e978b7691 am c4dba451: am b26bec1a: am 83930bc3: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started automerge: 3a3ff59 automerge: 5b2b7e1
* commit 'c4dba4513b22a59911bfee358c6537f53bbb89a7':
2015-01-29 20:51:11 +00:00
Fyodor Kupolov
c4dba4513b am b26bec1a: am 83930bc3: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started automerge: 3a3ff59 automerge: 5b2b7e1
* commit 'b26bec1a6fd7c03d667d7fa83bffd0ee8afb7b3e':
2015-01-29 20:46:13 +00:00
Fyodor Kupolov
b26bec1a6f am 83930bc3: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started automerge: 3a3ff59 automerge: 5b2b7e1
* commit '83930bc3ee26001e18a3f708e05c0e967e21e559':
2015-01-29 20:39:11 +00:00
Fyodor Kupolov
83930bc3ee am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started automerge: 3a3ff59
automerge: 5b2b7e1

* commit '5b2b7e189766e889118059902a15a4ce2c127e9d':
2015-01-29 20:34:29 +00:00
Fyodor Kupolov
56bc9f3200 am ac840cd9: am f400051c: am 9e432a69: am d7e93570: am f11f9f47: Added a check if a custom activity can be started automerge: 57641a8 automerge: 0738bae
* commit 'ac840cd91b77c0a37723723a9d6101beec53bcd1':
2015-01-29 19:51:01 +00:00
Fyodor Kupolov
ac840cd91b am f400051c: am 9e432a69: am d7e93570: am f11f9f47: Added a check if a custom activity can be started automerge: 57641a8 automerge: 0738bae
* commit 'f400051c3a6476154adf185399cb2ad8b2b16657':
2015-01-29 19:42:06 +00:00
Fyodor Kupolov
5b2b7e1897 am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
automerge: 3a3ff59

* commit '3a3ff591976ef7503d382be2897cad5710cd80e7':
  Added a check if a custom activity can be started
2015-01-29 19:39:59 +00:00
Fyodor Kupolov
f400051c3a am 9e432a69: am d7e93570: am f11f9f47: Added a check if a custom activity can be started automerge: 57641a8 automerge: 0738bae
* commit '9e432a698b6422118c2cc0d0a6c12194c9d1fc32':
2015-01-29 19:35:11 +00:00
Fyodor Kupolov
9e432a698b am d7e93570: am f11f9f47: Added a check if a custom activity can be started automerge: 57641a8
automerge: 0738bae

* commit '0738bae9164b150ce81b8cba57be9105a0308115':
2015-01-29 19:29:20 +00:00
Fyodor Kupolov
159ea9fd05 am 037c8118: am 6355e115: am 77a2e3d6: am 3a3ff591: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
* commit '037c811844cb29a16e940e6fbeae721c12715684':
  Added a check if a custom activity can be started
2015-01-29 19:22:15 +00:00
Fyodor Kupolov
037c811844 am 6355e115: am 77a2e3d6: am 3a3ff591: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
* commit '6355e1152ab29735721c40cfab6431a65341218b':
  Added a check if a custom activity can be started
2015-01-29 19:16:10 +00:00
Fyodor Kupolov
6355e1152a am 77a2e3d6: am 3a3ff591: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
* commit '77a2e3d62574be9cf0aae17231fd423a7a399984':
  Added a check if a custom activity can be started
2015-01-29 19:09:23 +00:00
Fyodor Kupolov
77a2e3d625 am 3a3ff591: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
* commit '3a3ff591976ef7503d382be2897cad5710cd80e7':
  Added a check if a custom activity can be started
2015-01-29 19:03:01 +00:00
Fyodor Kupolov
3a3ff59197 am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
* commit 'a6c8a0e66d92bde12ae6f1934f020e7700db05d1':
  Added a check if a custom activity can be started
2015-01-29 18:57:22 +00:00
Fyodor Kupolov
a6c8a0e66d am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
* commit 'd8b606b81a5ed77d3d2cbbaa7de26853126c25d7':
  Added a check if a custom activity can be started
2015-01-29 18:50:43 +00:00
Fyodor Kupolov
d8b606b81a am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
* commit '2f3bc3cb3f5add3962fb0ad441c27d44fede7787':
  Added a check if a custom activity can be started
2015-01-29 18:45:51 +00:00
Fyodor Kupolov
0897212d2d am 9fce9185: am bd89b7b4: am 0d5ad3b7: am 57641a8b: am d7e93570: am f11f9f47: Added a check if a custom activity can be started
* commit '9fce9185513ebaf551ded3937c2767f9ed7bea0f':
  Added a check if a custom activity can be started
2015-01-29 18:32:55 +00:00
Fyodor Kupolov
9fce918551 am bd89b7b4: am 0d5ad3b7: am 57641a8b: am d7e93570: am f11f9f47: Added a check if a custom activity can be started
* commit 'bd89b7b45ef9572c5e8523f0c8bd723958847df5':
  Added a check if a custom activity can be started
2015-01-29 18:24:21 +00:00
Fyodor Kupolov
bd89b7b45e am 0d5ad3b7: am 57641a8b: am d7e93570: am f11f9f47: Added a check if a custom activity can be started
* commit '0d5ad3b73ef524b4aa09e86d3c3a68b48be0d1d1':
  Added a check if a custom activity can be started
2015-01-29 18:19:06 +00:00
Fyodor Kupolov
0738bae916 am d7e93570: am f11f9f47: Added a check if a custom activity can be started
automerge: 57641a8

* commit '57641a8b5080b5122fcdd98c56fffaef90b3992d':
  Added a check if a custom activity can be started
2015-01-29 18:12:42 +00:00
Fyodor Kupolov
2f3bc3cb3f am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
* commit 'e3904c4f09b1a828e2d1f2f3536cdc8eca84a6aa':
  Added a check if a custom activity can be started
2015-01-29 18:12:04 +00:00
Fyodor Kupolov
0d5ad3b73e am 57641a8b: am d7e93570: am f11f9f47: Added a check if a custom activity can be started
* commit '57641a8b5080b5122fcdd98c56fffaef90b3992d':
  Added a check if a custom activity can be started
2015-01-29 18:09:29 +00:00
Fyodor Kupolov
57641a8b50 am d7e93570: am f11f9f47: Added a check if a custom activity can be started
* commit 'd7e93570d35cfec4e5de0f3edc5d326ecdb8a442':
  Added a check if a custom activity can be started
2015-01-29 18:02:40 +00:00
Fyodor Kupolov
e3904c4f09 am e8e7b9b3: Added a check if a custom activity can be started
* commit 'e8e7b9b3811b3295454298b02f136adf0527d1da':
  Added a check if a custom activity can be started
2015-01-29 18:01:00 +00:00
Fyodor Kupolov
d7e93570d3 am f11f9f47: Added a check if a custom activity can be started
* commit 'f11f9f47d3cfb5d1b9e7da1705252e75913410f1':
  Added a check if a custom activity can be started
2015-01-29 17:55:47 +00:00
Pavel Zhamaitsiak
8594728f59 am 882000f3: Merge "Add button in "hidden" settings to flip "VoLTE Provisioned" flag" into lmp-mr1-dev
* commit '882000f39b91d908cc5e83cec47e7ce630d68e1a':
  Add button in "hidden" settings to flip "VoLTE Provisioned" flag
2015-01-28 19:05:16 +00:00
Pavel Zhamaitsiak
882000f39b Merge "Add button in "hidden" settings to flip "VoLTE Provisioned" flag" into lmp-mr1-dev 2015-01-28 18:59:18 +00:00
Geoff Mendal
3c4d459566 am b5ad15ae: (-s ours) Import translations. DO NOT MERGE
* commit 'b5ad15ae2476eaf53694c3c87df45df7f7773198':
  Import translations. DO NOT MERGE
2015-01-28 15:33:29 +00:00
Geoff Mendal
b5ad15ae24 Import translations. DO NOT MERGE
Change-Id: I5d5971528e80df5a3582a364a0153338c63701d8
Auto-generated-cl: translation import
2015-01-28 06:47:47 -08:00
Fyodor Kupolov
f11f9f47d3 Added a check if a custom activity can be started
AppRestrictionsFragment starts an activity using an intent provided by the
receiver. A check was added to prevent an app from starting an activity that
it does not own.

Bug: 14441412
Change-Id: Ia6820b1daf3783d605b92976c78cb522b17dc8f2
(cherry picked from commit 07ab95c43e)
2015-01-28 10:31:36 +00:00
Fyodor Kupolov
e8e7b9b381 Added a check if a custom activity can be started
AppRestrictionsFragment starts an activity using an intent provided by the
receiver. A check was added to prevent an app from starting an activity that
it does not own.

Bug: 14441412
Change-Id: Ia6820b1daf3783d605b92976c78cb522b17dc8f2
2015-01-28 05:23:07 -05:00
Mick Lin
5b4b1044f8 am 09c9e5eb: [DS] Correct the access method for telephony system property
* commit '09c9e5eb5d8d223b3b3faa29ce8b03f8873d0553':
  [DS] Correct the access method for telephony system property
2015-01-27 17:17:19 +00:00
Mick Lin
09c9e5eb5d [DS] Correct the access method for telephony system property
Bug: 18675498

    Review: https://partner-android-review.git.corp.google.com/#/c/198822

Change-Id: I7d6eab7d8f513de20bd8995b999a124097f725e7
2015-01-27 05:30:47 +00:00
Jeff Sharkey
0900488c10 am 9c167e92: Fix secondary data usage color regression.
* commit '9c167e92df8b42c5ff5955c1186cacd4dc44914d':
  Fix secondary data usage color regression.
2015-01-26 23:38:40 +00:00
Jeff Sharkey
9c167e92df Fix secondary data usage color regression.
Show overall usage with a 50% transparency when looking at a
specific app details page.  (Otherwise you can't tell them apart.)

Bug: 18927935
Change-Id: I0cad1ba0451a9dab3ed90fa5aa53c115dbe3e1d3
2015-01-26 14:18:19 -08:00
Geoff Mendal
6e6be733ce am 26a3e949: (-s ours) Import translations. DO NOT MERGE
* commit '26a3e949c591fe2a51a84833fa1e835ea805efcb':
  Import translations. DO NOT MERGE
2015-01-26 15:16:47 +00:00
Geoff Mendal
26a3e949c5 Import translations. DO NOT MERGE
Change-Id: Iec41803b44675805c7c1df742682b986fb1015f0
Auto-generated-cl: translation import
2015-01-26 06:43:26 -08:00
Sanket Padawe
a8b78f96ae Merge "Hide APNs with type="ia" and apn=""" into lmp-mr1-dev 2015-01-23 23:55:13 +00:00
Sanket Padawe
a7f21a3100 Hide APNs with type="ia" and apn=""
APNs with type="ia" and no APN address (apn="") are used to
prevent an initial attach APN from being sent to the modem. This
in turn prevents the LTE ESM information procedure from being
used during the LTE attach. These APNs are meaningless and confusing to end users - so this
change hides them from the APN list.

Bug: 19101183
Change-Id: I9aacf787f8c175a301ad546f972f8972aad2a6b3
2015-01-23 09:53:48 -08:00
Zoltan Szatmary-Ban
387597a256 Merge "Show removed user's data usage under its correct item" into lmp-mr1-dev 2015-01-23 10:57:14 +00:00
Pavel Zhamaitsiak
cb267a6f8c Add button in "hidden" settings to flip "VoLTE Provisioned" flag
VoLTE Provisioned flag can be lost when new device image is flashed. Currently
there is no way to trigger Verizon provisioning update from device. This patch
adds button in hidden settings which allow to manually change value of the
flag.

Bug: 19038362
Change-Id: I23f13004dbcf9eaf711c66261696772b1d7bfd6e
2015-01-22 02:57:37 +00:00
Sanket Padawe
5f1eb2d72a Merge "Fixed data connection toggle crash in Settings." into lmp-mr1-dev 2015-01-21 17:08:45 +00:00
Geoff Mendal
75c5298e06 Import translations. DO NOT MERGE
Change-Id: Iec85d27eb1b30f9d04c74b75e35d86e3a9d3a4e8
Auto-generated-cl: translation import
2015-01-21 06:44:20 -08:00
Maurice Lam
ff649c601d Merge "[WifiSetup] Don't pan the window for IME" into lmp-mr1-dev 2015-01-20 21:21:41 +00:00
Sanket Padawe
766ab606e3 Fixed data connection toggle crash in Settings.
Bug: 19066882
Change-Id: Ib2c7b55d059ddda0543f11ded039ac82bc036850
2015-01-20 10:36:15 -08:00
Geoff Mendal
69b87f7925 Import translations. DO NOT MERGE
Change-Id: I5e8d466062fa0483aecaefdac20c34e219b43b3a
Auto-generated-cl: translation import
2015-01-19 07:07:29 -08:00
Zoltan Szatmary-Ban
77c1d36de5 Show removed user's data usage under its correct item
Users for which UserManager.getUserInfo returned null were shown as
unnamed users on Settings > Data Usage. This behavior has now changed
to show their data usage under the same item as UID_REMOVED.

Bug: 18174376
Change-Id: I8d172647edb51f7a277b4b714e9b7f3a0b5f3154
(cherry picked from commit cd9b1507fb)
2015-01-19 10:53:45 +00:00
Andre Eisenbach
906fc41724 Merge "Do not perform SDP during pairing" into lmp-mr1-dev 2015-01-16 02:01:05 +00:00
Maurice Lam
98f245069b [WifiSetup] Don't pan the window for IME
Suppress panning the activity window for the IME because that is
causing garbage to be drawn.

Bug: 18974000
Change-Id: I42429241425be0e520e9b36d1e134748ae583076
2015-01-15 11:55:15 -08:00
Andre Eisenbach
63e0f16c63 Do not perform SDP during pairing
As a result of commit 7de119c (ag/591931), SDP is performed when the
pairing dialog pops up. There are multiple problems with this. On badly
behaved devices an SDP request might trigger pairing from the remote
side, other devices (like Logitech keyboards) will close the connection
once SDP disconnects, causing the pairing to fail.

Further more, fetchUuidsWithSdk() is an asynchronous call. The code that
was added does not wait for SDP to complete. Thus the check for the PBAP
UUID will always fail and cause the permission check to still be
displayed.

With this change, SDP is not performed when the dialog is popped up and
PBAP permission is granted after bonding and subsequent service
discovery in accordance with final consensus in bug 16964116.

Bug: 18948640
Change-Id: I149afa8ae59b63f59ba579c12f97c3ea3d70112c
2015-01-15 11:24:49 -08:00