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

50615 Commits

Author SHA1 Message Date
Ian Pedowitz
2d7a9d373f am c3e4f31e: am 76b07705: am 4d2eec14: am df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev 
* commit 'c3e4f31e9ba64f92e3f06a9ce401211c1c058859':
  Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""
 2015-08-05 17:11:18 +00:00
Ian Pedowitz
76b0770558 am 4d2eec14: am df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev 
* commit '4d2eec1434f08667999b9cc51e6cf6f7146003e5':
  Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""
 2015-08-05 16:55:22 +00:00
Ian Pedowitz
4d2eec1434 am df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev 
* commit 'df5a66110777554d5b163693ac8395d7c21c328f':
  Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""
 2015-08-05 16:48:18 +00:00
Ian Pedowitz
df5a661107 Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev 2015-08-05 14:34:13 +00:00
Ian Pedowitz
6cc066df7a Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup"" 
This reverts commit 845d14db90.

Bug: 22942480
Bug: 22902898
Change-Id: If2d0e11594284414953c3dd45475fc7ba3366295
 2015-08-05 14:25:15 +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
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
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
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
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
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
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
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
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
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
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
Wale Ogunwale
fad3cfed7b am a93e7e5e: am c170d7de: am ae351ec1: am b2690f38: Merge "Fail silently if a process trys to launch an acitvity for background user" into mnc-dev 
* commit 'a93e7e5e7817d354997e7c4c16a95776498b9f91':
  Fail silently if a process trys to launch an acitvity for background user
 2015-08-04 15:08:09 +00:00
Ian Pedowitz
8a4465e8ec am 682e0237: am 845d14db: Revert "Permissions: GET_ACCOUNTS permission cleanup" 
* commit '682e0237eccd58efac776fd282021ec16259b632':
  Revert "Permissions: GET_ACCOUNTS permission cleanup"
 2015-08-04 15:02:41 +00:00
Ian Pedowitz
682e0237ec am 845d14db: Revert "Permissions: GET_ACCOUNTS permission cleanup" 
* commit '845d14db9066c3262f270237b52e315aa71508b2':
  Revert "Permissions: GET_ACCOUNTS permission cleanup"
 2015-08-04 14:55:54 +00:00
Wale Ogunwale
c170d7ded3 am ae351ec1: am b2690f38: Merge "Fail silently if a process trys to launch an acitvity for background user" into mnc-dev 
* commit 'ae351ec112dc5ad23585552af30a138aa29ed2f5':
  Fail silently if a process trys to launch an acitvity for background user
 2015-08-04 14:53:33 +00:00
Ian Pedowitz
845d14db90 Revert "Permissions: GET_ACCOUNTS permission cleanup" 
Temporarily revert ag/735253 until b/22902898 can be resolved with a
proper DMAgent prebuilt drop.

This reverts commit e7ed827a10.

Bug: 22902898
 2015-08-04 07:47:37 -07:00
Wale Ogunwale
ae351ec112 am b2690f38: Merge "Fail silently if a process trys to launch an acitvity for background user" into mnc-dev 
* commit 'b2690f3857d207321c8e6dc85a3b529ac52404f2':
  Fail silently if a process trys to launch an acitvity for background user
 2015-08-04 14:46:07 +00:00
Wale Ogunwale
b2690f3857 Merge "Fail silently if a process trys to launch an acitvity for background user" into mnc-dev 2015-08-04 14:38:04 +00:00
Paul Jensen
487ffe7d3d Fix NOT_RESTRICTED network capability and enforce it. 
With this change:
1. NOT_RESTRICTED should be removed from NetworkRequests that bring up
   special restricted carrier networks (e.g. IMS, FOTA).
2. NetworkRequests without NOT_RESTRICTED require CONNECTIVITY_INTERNAL
   permission to register
3. Binding sockets to networks without NOT_RESTRICTED requires
   CONNECTIVITY_INTERNAL permission

Bug:21637535
Change-Id: I5991d39facaa6b690e969fe15dcbeec52e918321
 2015-08-04 07:24:24 -04:00
Dianne Hackborn
d4b8064e42 am 14bafef5: am 24922798: am b20a8ed9: am d9b0f843: Merge "Fix issue #22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev 
* commit '14bafef5b050f14c0fed3bfed8b137862139e627':
  Fix issue #22860466: viapi security bug - rubber stamping in nested VIs
 2015-08-04 01:37:57 +00:00
Dianne Hackborn
aa860fd83a am 35c68de9: am 5dd9ef04: am b0bc8368: am 3011f645: Merge "Fix issue #22912704: "android.process.acore has stopped" dialog keeps popping up" into mnc-dev 
* commit '35c68de93dfec0a237642cca56ade0ba3a6aff92':
  Fix issue #22912704: "android.process.acore has stopped" dialog keeps popping up
 2015-08-04 01:30:52 +00:00
Dianne Hackborn
2492279816 am b20a8ed9: am d9b0f843: Merge "Fix issue #22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev 
* commit 'b20a8ed952e703801eebde2e6d9280b5bac0a689':
  Fix issue #22860466: viapi security bug - rubber stamping in nested VIs
 2015-08-04 01:19:55 +00:00
Matthew Williams
665d0140ef Remove spurious syncmanager wake-ups 
BUG: 22287469
1) Fix SyncManager waking up every 2 hrs if there is nothing
to do.
2) Fix sync wake-up alarm not being properly updated if the new
alarm was in the future.
2a) Due to staus bar sync signal that were removed post-K
one of the wake-ups was for 30s in the future, removed this
@hide intent completely.
3) The SyncManager will still set a timeout alarm for 5mins after
the start of a sync. Leaving this in as to post to a handler is
less expensive but more complex, and the alarm update is
correctly working now.

Change-Id: If51c9dd68391ccaeb480a17eb5a1364c4afe4c2a
 2015-08-03 18:15:12 -07:00
Dianne Hackborn
b20a8ed952 am d9b0f843: Merge "Fix issue #22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev 
* commit 'd9b0f8435ba9b099512288729af24858a95fd013':
  Fix issue #22860466: viapi security bug - rubber stamping in nested VIs
 2015-08-04 01:12:33 +00:00
Dianne Hackborn
5dd9ef044c am b0bc8368: am 3011f645: Merge "Fix issue #22912704: "android.process.acore has stopped" dialog keeps popping up" into mnc-dev 
* commit 'b0bc8368f53e80236026e54311f2dda7b662c664':
  Fix issue #22912704: "android.process.acore has stopped" dialog keeps popping up
 2015-08-04 01:09:02 +00:00
Dianne Hackborn
d9b0f8435b Merge "Fix issue #22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev 2015-08-04 01:07:36 +00:00