Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
210,507 Commits 3 Branches 0 Tags
2b45f8a6ce623012b2fc6237acd1bdc6ebe2c85c
Commit Graph

56508 Commits

Author SHA1 Message Date
Xiaohui Chen
2b45f8a6ce Clean up USER_OWNER references in settingslib. 
Bug: 19913735
Change-Id: I0ccaed63c8fbc3bcbbd8d5cf8047e33c6e2edb5c
 2015-08-05 16:31:19 +00:00
Paul Jensen
9180e2ea59 am abd27102: am 41779e46: am 95297732: am 86e7d135: resolved conflicts for merge of dbc4edcc to mnc-dr-dev 
* commit 'abd27102f4e232be448bc6012e0bd833637ab3fa':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-08-05 11:44:46 +00:00
Paul Jensen
abd27102f4 am 41779e46: am 95297732: am 86e7d135: resolved conflicts for merge of dbc4edcc to mnc-dr-dev 
* commit '41779e467a478e11de2df10ad97542e6f2d57ca7':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-08-05 11:38:26 +00:00
Paul Jensen
9529773222 am 86e7d135: resolved conflicts for merge of dbc4edcc to mnc-dr-dev 
* commit '86e7d135acbdb0055de6a687817d44ac60603c9f':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-08-05 11:24:18 +00:00
Paul Jensen
86e7d135ac resolved conflicts for merge of dbc4edcc to mnc-dr-dev 
Change-Id: I3a8624b2b375e0d174983d7690082e0e6932c4de
 2015-08-05 07:07:24 -04:00
Paul Jensen
dbc4edccfc Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev 2015-08-05 10:03:47 +00:00
Filip Gruszczynski
101d93bfb8 am 42969008: am 94858568: am c3080d78: am 841d7b75: am 52d3312a: Merge "Make ResourceKey always use non-null configuration override." into mnc-dev 
* commit '42969008ef898f204fc9f3504f85bb82ffc810c3':
  Make ResourceKey always use non-null configuration override.
 2015-08-04 23:47:21 +00:00
Filip Gruszczynski
42969008ef am 94858568: am c3080d78: am 841d7b75: am 52d3312a: Merge "Make ResourceKey always use non-null configuration override." into mnc-dev 
* commit '94858568a1ee6af7b40ae0fcc5c4453dffca1cb8':
  Make ResourceKey always use non-null configuration override.
 2015-08-04 23:39:08 +00:00
Filip Gruszczynski
c3080d7855 am 841d7b75: am 52d3312a: Merge "Make ResourceKey always use non-null configuration override." into mnc-dev 
* commit '841d7b75176f4ba086751f12ac57e5420ce501d8':
  Make ResourceKey always use non-null configuration override.
 2015-08-04 23:18:47 +00:00
Filip Gruszczynski
841d7b7517 am 52d3312a: Merge "Make ResourceKey always use non-null configuration override." into mnc-dev 
* commit '52d3312abeafd988ecb2288896b74ba72c3e70c0':
  Make ResourceKey always use non-null configuration override.
 2015-08-04 23:11:24 +00:00
Filip Gruszczynski
52d3312abe Merge "Make ResourceKey always use non-null configuration override." into mnc-dev 2015-08-04 23:02:19 +00:00
Mitchell Wills
008cde4da5 am c1d02417: am d9b729c7: am 992ae880: am e8c888c4: am 385dfd34: Merge "Charge apps for wifi tx time while scanning" into mnc-dev 
* commit 'c1d02417bbd4df7b3b8273a1fdd4dc7aedfef441':
  Charge apps for wifi tx time while scanning
 2015-08-04 22:40:07 +00:00
Mitchell Wills
c1d02417bb am d9b729c7: am 992ae880: am e8c888c4: am 385dfd34: Merge "Charge apps for wifi tx time while scanning" into mnc-dev 
* commit 'd9b729c7c5ab7f9f348edc61ddec41fb54ba5730':
  Charge apps for wifi tx time while scanning
 2015-08-04 22:31:57 +00:00
Filip Gruszczynski
a01f48681c Make ResourceKey always use non-null configuration override. 
We don't differentiate between null conifguration and
Configuration.EMPTY, but if ResourceKey uses both, it will produce
different hashes and won't be equal. This CL makes ResourceKey always
hold a non null reference to the Configuration object.

We started delivering the configuration overrides in
Ib2c7be0b427f5ce05e7a362bcdd496ddbc9164f0, which changed behavior from
using always null, to using both null and Conifguration.EMPTY for empty
confgiuration. Now we will switch to using only one value, which is
Configuration.EMPTY.

Bug: 22620824
Change-Id: I090fd90ac21a6b3ebc7f2974a91dd7c861af10d7
 2015-08-04 15:26:14 -07:00
Roshan Pius
38b4520735 am ea7632ac: am 9d15a496: am 1c53d91e: am 65b84a16: am 78b8d4aa: Mark missed calls as read in calllog restore(2/2) 
* commit 'ea7632ac0694a5ba04ef0d597300f92e5fc22962':
  Mark missed calls as read in calllog restore(2/2)
 2015-08-04 22:17:32 +00:00
Mitchell Wills
992ae88074 am e8c888c4: am 385dfd34: Merge "Charge apps for wifi tx time while scanning" into mnc-dev 
* commit 'e8c888c41949c174f8cc244f8d705e675a2f3c30':
  Charge apps for wifi tx time while scanning
 2015-08-04 22:12:30 +00:00
Roshan Pius
ea7632ac06 am 9d15a496: am 1c53d91e: am 65b84a16: am 78b8d4aa: Mark missed calls as read in calllog restore(2/2) 
* commit '9d15a496d1354210da4ad83ee018b6dacf14b478':
  Mark missed calls as read in calllog restore(2/2)
 2015-08-04 22:10:31 +00:00
Steve McKay
371d458838 Merge "Populate quick view intent w/ file uris." 2015-08-04 22:07:18 +00:00
Steve McKay
6eaf3863c8 Populate quick view intent w/ file uris. 
Change-Id: Ie4f15b11be1939f8b71752505caa9d74ab9f9680
 2015-08-04 15:06:40 -07:00
Mitchell Wills
e8c888c419 am 385dfd34: Merge "Charge apps for wifi tx time while scanning" into mnc-dev 
* commit '385dfd349ff773c499859ee44552995e9c25759c':
  Charge apps for wifi tx time while scanning
 2015-08-04 22:02:24 +00:00
Roshan Pius
1c53d91e81 am 65b84a16: am 78b8d4aa: Mark missed calls as read in calllog restore(2/2) 
* commit '65b84a165239ea8e50b8a7129da7eb1ad4536308':
  Mark missed calls as read in calllog restore(2/2)
 2015-08-04 21:56:58 +00:00
Mitchell Wills
385dfd349f Merge "Charge apps for wifi tx time while scanning" into mnc-dev 2015-08-04 21:55:46 +00:00
Roshan Pius
65b84a1652 am 78b8d4aa: Mark missed calls as read in calllog restore(2/2) 
* commit '78b8d4aa99ce866caacf291a446837416fa07bd7':
  Mark missed calls as read in calllog restore(2/2)
 2015-08-04 21:48:38 +00:00
Mitchell Wills
f901649bd9 Charge apps for wifi tx time while scanning 
Bug: 22955562
Change-Id: Ie2c6ab65e7b592272e1cad120ac606fcfd6ea677
 2015-08-04 14:47:01 -07:00
Yohei Yukawa
932cc25416 am 94381db0: am f4b8c343: am 9aebdb4c: am d7d14033: am 2d34a8b7: Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev 
* commit '94381db0dd29bcb7d6bf1f266644c7032b2bffcb':
  Revert "Do not forceLayout when window is resized"
 2015-08-04 21:29:28 +00:00
Nick Kralevich
1913ae958c am 8ad7c8f9: am 94933e43: am 2eafb06f: am b2c71814: am 97b68bbe: Merge "UsbDeviceManager: fix b/21429947 regression (try #2)" into mnc-dev 
* commit '8ad7c8f9553611798fa39ff20cea3313c5b64922':
  UsbDeviceManager: fix b/21429947 regression (try #2)
 2015-08-04 21:29:21 +00:00
Yohei Yukawa
94381db0dd am f4b8c343: am 9aebdb4c: am d7d14033: am 2d34a8b7: Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev 
* commit 'f4b8c343219f14f56c2c1b86ee9e84e0b7487ece':
  Revert "Do not forceLayout when window is resized"
 2015-08-04 21:18:50 +00:00
Nick Kralevich
8ad7c8f955 am 94933e43: am 2eafb06f: am b2c71814: am 97b68bbe: Merge "UsbDeviceManager: fix b/21429947 regression (try #2)" into mnc-dev 
* commit '94933e43dc9793f1bb788bee06000f8fbd8ed959':
  UsbDeviceManager: fix b/21429947 regression (try #2)
 2015-08-04 21:18:45 +00:00
Roshan Pius
78b8d4aa99 Mark missed calls as read in calllog restore(2/2) 
When missed calls are restored by CalllogBackupAgent using the addCall
API of CallLog provider, we were setting the IS_READ flag to 0 which
resulted in user getting a missed call notifications for all missed
calls after restore.
Adding a new addCall API signature which can specify the value to be put in the
IS_READ field when a call is added to the calllog provider. This will be
used by the CallLogBackupAgent to mark all restored missed calls as
read.

BUG: 22908952
Change-Id: Iee3bea09fbdefef09c7eb6c6c61728cb4d94d9e7
 2015-08-04 14:10:49 -07:00
Yohei Yukawa
9aebdb4c39 am d7d14033: am 2d34a8b7: Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev 
* commit 'd7d14033af438b88053454e7d73c1689eaa77c35':
  Revert "Do not forceLayout when window is resized"
 2015-08-04 20:54:48 +00:00
Nick Kralevich
2eafb06f5d am b2c71814: am 97b68bbe: Merge "UsbDeviceManager: fix b/21429947 regression (try #2)" into mnc-dev 
* commit 'b2c718146b1be18942bc5d76be68e0d437cbbe8b':
  UsbDeviceManager: fix b/21429947 regression (try #2)
 2015-08-04 20:54:44 +00:00
Yohei Yukawa
d7d14033af am 2d34a8b7: Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev 
* commit '2d34a8b7181635c0ff0b1f2390d70e3ac6960f00':
  Revert "Do not forceLayout when window is resized"
 2015-08-04 20:40:41 +00:00
Nick Kralevich
b2c718146b am 97b68bbe: Merge "UsbDeviceManager: fix b/21429947 regression (try #2)" into mnc-dev 
* commit '97b68bbe7180ca15ab10d6f65bbdac6c7e64885b':
  UsbDeviceManager: fix b/21429947 regression (try #2)
 2015-08-04 20:40:35 +00:00
Paul Soulos
2b1899a197 am af393e4b: am eca3760f: am 3adc6671: Merge "Fix doc typo for default wearable notification size." into cw-e-dev 
* commit 'af393e4b2d1fa0def0d104bfeaafa1ae1600d4d2':
  Fix doc typo for default wearable notification size.
 2015-08-04 20:36:52 +00:00
Paul Soulos
af393e4b2d am eca3760f: am 3adc6671: Merge "Fix doc typo for default wearable notification size." into cw-e-dev 
* commit 'eca3760f3a7ceae967a6afb5ff6b8a1e7cf541fa':
  Fix doc typo for default wearable notification size.
 2015-08-04 20:30:33 +00:00
Kevin Cernekee
1e0e22fdb6 Merge "Clean up javadoc in StateMachine" 2015-08-04 20:29:58 +00:00
Paul Soulos
3adc6671e9 Merge "Fix doc typo for default wearable notification size." into cw-e-dev 2015-08-04 20:13:41 +00:00
Yohei Yukawa
2d34a8b718 Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev 2015-08-04 19:51:20 +00:00
Nick Kralevich
97b68bbe71 Merge "UsbDeviceManager: fix b/21429947 regression (try #2)" into mnc-dev 2015-08-04 19:46:06 +00:00
Paul Soulos
aa4f4bf6ce Fix doc typo for default wearable notification size. 
Change-Id: Ic3428278eee0b541de3e1b355692401170d1ab3b
 2015-08-04 11:59:45 -07:00
Matthew Williams
da7526b4be am 7667fa48: am 1dee8d41: am c62598bc: am d5fe5a8f: am fad3c663: Merge "Remove spurious syncmanager wake-ups" into mnc-dev 
* commit '7667fa48224133adfbd4b1234c592988c0133713':
  Remove spurious syncmanager wake-ups
 2015-08-04 18:29:05 +00:00
Matthew Williams
7667fa4822 am 1dee8d41: am c62598bc: am d5fe5a8f: am fad3c663: Merge "Remove spurious syncmanager wake-ups" into mnc-dev 
* commit '1dee8d4164553082c392b236d30144b4bad16f22':
  Remove spurious syncmanager wake-ups
 2015-08-04 18:18:52 +00:00
Matthew Williams
c62598bc58 am d5fe5a8f: am fad3c663: Merge "Remove spurious syncmanager wake-ups" into mnc-dev 
* commit 'd5fe5a8fa1f770b929dbd786381a6ad45a754301':
  Remove spurious syncmanager wake-ups
 2015-08-04 17:57:23 +00:00
Matthew Williams
d5fe5a8fa1 am fad3c663: Merge "Remove spurious syncmanager wake-ups" into mnc-dev 
* commit 'fad3c6638168ad65b4f4677a777b8f2dc7e5c9c9':
  Remove spurious syncmanager wake-ups
 2015-08-04 17:46:11 +00:00
Nick Kralevich
1a008c1ca0 UsbDeviceManager: fix b/21429947 regression (try #2) 
As discussed in b/21429947 (commit
674019065b), MTP must always be
enabled, even if access to the underlying MTP data is disabled.
Otherwise, Android will not enumerate on the USB bus, and won't
receive notifications from the kernel about USB state changes. This
effectively prevents using MTP functionality on user builds, or
on userdebug/eng builds with adb turned off.

Always ensure that MTP is the default driver mode.

Move the DISALLOW_USB_FILE_TRANSFER filtering of mUsbDataUnlocked from
setting time to the time we post the sticky broadcast.

Remove isUsbDataUnlocked(). It essentially duplicates data in the sticky
broadcast.

Bug: 22447614
Bug: 21429947
Change-Id: I9d0d94cadbf6db6281ebd77bfb7162f9d06520c2
 2015-08-04 10:36:37 -07:00
Matthew Williams
fad3c66381 Merge "Remove spurious syncmanager wake-ups" into mnc-dev 2015-08-04 17:35:48 +00:00
Steve McKay
2909598322 Merge "Use an explicit intent for "Quick View"..." 2015-08-04 16:40:37 +00:00
Steve McKay
c78bcb8c7f Use an explicit intent for "Quick View"... 
Define Intent.ACTION_QUICK_VIEW.

Change-Id: Iae85a2a6fe35cfd135ff1af6672d37cc6b33dce4
 2015-08-04 09:36:29 -07:00
Ian Pedowitz
f9efa73748 am 75c240d4: am 573e92fc: am 8a4465e8: am 682e0237: am 845d14db: Revert "Permissions: GET_ACCOUNTS permission cleanup" 
* commit '75c240d4f3c7fcc9458016052beb9feb507c4897':
  Revert "Permissions: GET_ACCOUNTS permission cleanup"
 2015-08-04 15:26:34 +00:00
Ian Pedowitz
75c240d4f3 am 573e92fc: am 8a4465e8: am 682e0237: am 845d14db: Revert "Permissions: GET_ACCOUNTS permission cleanup" 
* commit '573e92fc352d499b75f26aded0b05d76fcbcaff5':
  Revert "Permissions: GET_ACCOUNTS permission cleanup"
 2015-08-04 15:18:36 +00:00