Commit Graph

7392 Commits

Author SHA1 Message Date
Thierry Strudel
22be410b18 Merge "Fix typo in SwappedOut reporting" into nyc-dev am: f40969ac2c
am: b7f515cf9b

* commit 'b7f515cf9b35a2ccee3c9999febc1955f8858596':
  Fix typo in SwappedOut reporting
2016-02-26 02:08:53 +00:00
Christopher Tate
8c6eb7c110 Merge "Fix \'<\' / \'>\' in JobService docs" into nyc-dev am: 7f220b8ec5
am: 2973c936e5

* commit '2973c936e51ccf3da5731ccd9d6f2d2307737677':
  Fix '<' / '>' in JobService docs
2016-02-26 02:07:34 +00:00
Thierry Strudel
b7f515cf9b Merge "Fix typo in SwappedOut reporting" into nyc-dev
am: f40969ac2c

* commit 'f40969ac2c19399847f153bfa248efcc0935db3c':
  Fix typo in SwappedOut reporting
2016-02-26 02:02:29 +00:00
Christopher Tate
2973c936e5 Merge "Fix \'<\' / \'>\' in JobService docs" into nyc-dev
am: 7f220b8ec5

* commit '7f220b8ec51386f0c19720293d7c9e372e91eb00':
  Fix '<' / '>' in JobService docs
2016-02-26 02:00:40 +00:00
Thierry Strudel
f40969ac2c Merge "Fix typo in SwappedOut reporting" into nyc-dev 2016-02-26 01:47:36 +00:00
Thierry Strudel
9b51160e0c Fix typo in SwappedOut reporting
Change-Id: I55b3725eba054d3d6d2b38041cf375fc7b141c69
2016-02-25 17:46:38 -08:00
Christopher Tate
a8e24f24bd Fix '<' / '>' in JobService docs
Bug 27291714

Change-Id: I7e6ec24442bdd071d34faa980d201f4c747cadff
2016-02-25 16:28:35 -08:00
Winson Chung
923ddb7527 Merge changes Ib309e9de,Ia7cf8b99,I055b0825,Ie2ea4318,If92221d3 into nyc-dev am: e1c4641d6f
am: 27f2698fa4

* commit '27f2698fa46f77955d2dbe5d905796d0139b9edd':
  Fixing crash when focusing tasks.
  Minor tweaks to layout and visuals.
  Improving transition from paging to stack.
  Fixing issue with persistent screenshot notification
  Updating task description when activity is visible.
2016-02-25 07:07:19 +00:00
Winson Chung
27f2698fa4 Merge changes Ib309e9de,Ia7cf8b99,I055b0825,Ie2ea4318,If92221d3 into nyc-dev
am: e1c4641d6f

* commit 'e1c4641d6f7d234a912284254f67c0122d7eca5b':
  Fixing crash when focusing tasks.
  Minor tweaks to layout and visuals.
  Improving transition from paging to stack.
  Fixing issue with persistent screenshot notification
  Updating task description when activity is visible.
2016-02-25 03:17:24 +00:00
Winson Chung
e1c4641d6f Merge changes Ib309e9de,Ia7cf8b99,I055b0825,Ie2ea4318,If92221d3 into nyc-dev
* changes:
  Fixing crash when focusing tasks.
  Minor tweaks to layout and visuals.
  Improving transition from paging to stack.
  Fixing issue with persistent screenshot notification
  Updating task description when activity is visible.
2016-02-25 03:15:25 +00:00
Thierry Strudel
b4dd9b60ef Merge "Revert "Temporary fix for QXDM crashes."" into nyc-dev am: 0601a1c670
am: 6f5d54ebef

* commit '6f5d54ebef08da95003b4e79d3e4d4ab20c0a06c':
  Revert "Temporary fix for QXDM crashes."
2016-02-25 02:39:29 +00:00
Thierry Strudel
6f5d54ebef Merge "Revert "Temporary fix for QXDM crashes."" into nyc-dev
am: 0601a1c670

* commit '0601a1c6701aafca16c0e1c65962fe00d256e624':
  Revert "Temporary fix for QXDM crashes."
2016-02-25 02:30:15 +00:00
Thierry Strudel
0601a1c670 Merge "Revert "Temporary fix for QXDM crashes."" into nyc-dev 2016-02-25 02:16:51 +00:00
Edward Cunningham
ab8c082879 Merge "Revert "DO NOT MERGE Extend the DownloadManager.addCompletedDownload() method to support origin details."" into nyc-dev
am: 648b952956

* commit '648b952956d4e2459f28982e5aa4ab53411e752b':
  Revert "DO NOT MERGE Extend the DownloadManager.addCompletedDownload() method to support origin details."
2016-02-25 02:15:51 +00:00
Thierry Strudel
e60b28d99b Revert "Temporary fix for QXDM crashes."
This reverts commit d7793693ad.

Change-Id: I9f27d6d5075be7b170ebe7a5bf4f2c3fe8c7c604
2016-02-25 02:14:16 +00:00
Edward Cunningham
648b952956 Merge "Revert "DO NOT MERGE Extend the DownloadManager.addCompletedDownload() method to support origin details."" into nyc-dev 2016-02-25 01:10:57 +00:00
Winson
b6403150af Updating task description when activity is visible.
Bug: 27275448
Change-Id: If92221d30c84c58b5d36db1b254d264a0ff3ec25
2016-02-24 16:30:17 -08:00
Adam Powell
0f646a0865 Merge "Protect FragmentManager against View.NO_ID container ids" into nyc-dev am: dc5e3a3074
am: ee1970208e

* commit 'ee1970208e4e6a168113fb3cf57901de30282204':
  Protect FragmentManager against View.NO_ID container ids
2016-02-24 23:12:17 +00:00
Adam Powell
ee1970208e Merge "Protect FragmentManager against View.NO_ID container ids" into nyc-dev
am: dc5e3a3074

* commit 'dc5e3a30745ecdb219b33cec2b826f377ba5d134':
  Protect FragmentManager against View.NO_ID container ids
2016-02-24 23:06:01 +00:00
Todd Kennedy
bbba6c2d3c Merge "Revert "Remove deprecated methods / classes"" into nyc-dev am: fe01ea05dd
am: acbcf9d9ab

* commit 'acbcf9d9abfdecaf9c8038f810e12e183c59f422':
  Revert "Remove deprecated methods / classes"
2016-02-24 23:04:53 +00:00
Adam Powell
dc5e3a3074 Merge "Protect FragmentManager against View.NO_ID container ids" into nyc-dev 2016-02-24 23:01:34 +00:00
Todd Kennedy
acbcf9d9ab Merge "Revert "Remove deprecated methods / classes"" into nyc-dev
am: fe01ea05dd

* commit 'fe01ea05dd196acaf95a61e169f6b75654ae0875':
  Revert "Remove deprecated methods / classes"
2016-02-24 22:54:13 +00:00
Makoto Onuki
137077cddd Merge "Support safe mode properly." into nyc-dev am: a4fae1545a
am: 04d8eca54a

* commit '04d8eca54af9d46e793134a9168f658b9d68017f':
  Support safe mode properly.
2016-02-24 22:47:47 +00:00
Todd Kennedy
fe01ea05dd Merge "Revert "Remove deprecated methods / classes"" into nyc-dev 2016-02-24 22:45:50 +00:00
Todd Kennedy
5cbeb59026 Revert "Remove deprecated methods / classes"
This reverts commit 9706c01f9b.

Change-Id: I14c53ab140220e48f6728b1173ea58760bbeb7f9
2016-02-24 22:45:00 +00:00
Edward Cunningham
c6f5738d3c Revert "DO NOT MERGE Extend the DownloadManager.addCompletedDownload() method to support origin details."
This reverts commit baccf15a4a.

Change-Id: If218d579cbf473fdab2b16a715a5dbb75dc9fbbc
2016-02-24 22:43:15 +00:00
Makoto Onuki
04d8eca54a Merge "Support safe mode properly." into nyc-dev
am: a4fae1545a

* commit 'a4fae1545ae38f61385e45e8f635994f447efca5':
  Support safe mode properly.
2016-02-24 22:29:58 +00:00
Makoto Onuki
a4fae1545a Merge "Support safe mode properly." into nyc-dev 2016-02-24 22:20:08 +00:00
Jeff Sharkey
1b4676b638 Merge "Temporary fix for QXDM crashes." into nyc-dev am: 2f457f470c
am: aedb89b0c5

* commit 'aedb89b0c5a92851193bfbde3a1be528fbb29850':
  Temporary fix for QXDM crashes.
2016-02-24 21:38:40 +00:00
Jeff Sharkey
aedb89b0c5 Merge "Temporary fix for QXDM crashes." into nyc-dev
am: 2f457f470c

* commit '2f457f470cd260f07ab481ab6fb3cad143f9a958':
  Temporary fix for QXDM crashes.
2016-02-24 21:29:17 +00:00
Todd Kennedy
0e52890e2b Merge "Remove deprecated methods / classes" into nyc-dev am: ca67844e0c
am: 07e794ad14

* commit '07e794ad14e0cfa433402a2fca4c14d26192facb':
  Remove deprecated methods / classes
2016-02-24 21:22:45 +00:00
Jeff Sharkey
2f457f470c Merge "Temporary fix for QXDM crashes." into nyc-dev 2016-02-24 21:16:35 +00:00
Jeff Sharkey
d7793693ad Temporary fix for QXDM crashes.
Bug: 26971038
Change-Id: I59efbdec11ca8d9a0b640c092402091d66b220a0
2016-02-24 14:15:03 -07:00
Makoto Onuki
889c088066 Support safe mode properly.
In safe mode, IPM.queryXxx() doesn't work.  Use IPM.getReceiverInfo()
directly instead.

Bug 27108276

Change-Id: Ice8f882559b8f0596a19ddb3a16395a4dc538a25
2016-02-24 13:12:01 -08:00
Todd Kennedy
07e794ad14 Merge "Remove deprecated methods / classes" into nyc-dev
am: ca67844e0c

* commit 'ca67844e0c6b564970b8d329009c0d110888a3fc':
  Remove deprecated methods / classes
2016-02-24 21:11:47 +00:00
Todd Kennedy
ca67844e0c Merge "Remove deprecated methods / classes" into nyc-dev 2016-02-24 21:02:58 +00:00
Amith Yamasani
4e7188169d Merge "Optimize calls to TelephonyManager to check for privileged apps" into nyc-dev am: 66f0c6f3b8
am: 056454791e

* commit '056454791e370b83a98ffd9c7d88b2693644cb6a':
  Optimize calls to TelephonyManager to check for privileged apps
2016-02-24 19:59:09 +00:00
Sergey Poromov
e5ffeb4244 Merge "Fix NPE when null BackupObserver is passed into BackupManager#requestBackup()" into nyc-dev am: 54aaeb72e9
am: 83c62153c7

* commit '83c62153c729b3b2cfd62a86457ab6238de2cc55':
  Fix NPE when null BackupObserver is passed into BackupManager#requestBackup()
2016-02-24 19:56:54 +00:00
Amith Yamasani
056454791e Merge "Optimize calls to TelephonyManager to check for privileged apps" into nyc-dev
am: 66f0c6f3b8

* commit '66f0c6f3b8bde3ba224a1333a4acbf1b86c959ec':
  Optimize calls to TelephonyManager to check for privileged apps
2016-02-24 19:52:56 +00:00
Sergey Poromov
83c62153c7 Merge "Fix NPE when null BackupObserver is passed into BackupManager#requestBackup()" into nyc-dev
am: 54aaeb72e9

* commit '54aaeb72e9c4cfad94c55ea2b66815d8541b7073':
  Fix NPE when null BackupObserver is passed into BackupManager#requestBackup()
2016-02-24 19:50:38 +00:00
Amith Yamasani
66f0c6f3b8 Merge "Optimize calls to TelephonyManager to check for privileged apps" into nyc-dev 2016-02-24 19:42:12 +00:00
Sergey Poromov
54aaeb72e9 Merge "Fix NPE when null BackupObserver is passed into BackupManager#requestBackup()" into nyc-dev 2016-02-24 19:40:53 +00:00
Amith Yamasani
4ec6368f13 Optimize calls to TelephonyManager to check for privileged apps
Calling into TelephonyManager each of hundreds of apps to check
if the app is carrier privileged was very expensive, especially
when there aren't even any carrier access rules specified. This
change fetches all the carrier privileged apps in one call,
reducing the number of IPC calls to the radio process and checks
the package names locally.

If the carrier rules change or packages are modified, the list
will be computed and fetched again.

Other optimizations in Telephony help speed up the individual calls
to check if a package is privileged, as well.

Bug: 27271861
Change-Id: I5a77b6da4f2cdc603d2a73bd8569c5c38f06b42d
2016-02-24 11:30:00 -08:00
Sergey Poromov
899edf6f4f Fix NPE when null BackupObserver is passed into BackupManager#requestBackup()
BackupManagerService has the null check, but it doesn't work
because passed BackupObserver object is wrapped into
this BackupObserverWrapper.
This was found during GTS testing.

Bug: 27334738
Change-Id: I16dc0230824b326d3fae1f8489f58b0c0d4e1c7c
2016-02-24 19:36:26 +01:00
Robin Lee
a1f36e58b6 Merge "DPM: installKeyPair variant: caller can self-grant" into nyc-dev am: 155a280e18
am: 589e36e10a

* commit '589e36e10ad8406095a77a029b2871be63fd4c0c':
  DPM: installKeyPair variant: caller can self-grant
2016-02-24 18:23:53 +00:00
Robin Lee
589e36e10a Merge "DPM: installKeyPair variant: caller can self-grant" into nyc-dev
am: 155a280e18

* commit '155a280e18200aeaa0e7d5e31d6b8b0115c58e42':
  DPM: installKeyPair variant: caller can self-grant
2016-02-24 18:18:55 +00:00
Robin Lee
155a280e18 Merge "DPM: installKeyPair variant: caller can self-grant" into nyc-dev 2016-02-24 18:14:36 +00:00
Dianne Hackborn
fe60596ff1 Merge "Work towards issue #26390161: Throttle syncs/jobs when system is low on RAM" into nyc-dev am: 11007fa30c
am: f6461b288e

* commit 'f6461b288eec466bd82439f5b5bdfec28483bb68':
  Work towards issue #26390161: Throttle syncs/jobs when system is low on RAM
2016-02-24 18:09:44 +00:00
Dianne Hackborn
f6461b288e Merge "Work towards issue #26390161: Throttle syncs/jobs when system is low on RAM" into nyc-dev
am: 11007fa30c

* commit '11007fa30c139935a93c520236800e64891b0f33':
  Work towards issue #26390161: Throttle syncs/jobs when system is low on RAM
2016-02-24 18:02:43 +00:00
Robin Lee
ce3399fbb4 DPM: installKeyPair variant: caller can self-grant
If 'requestAccess' is true, the caller (either profile/device owner or a
designated certificate installer) will be granted usage of the keypair
on successful installation.

This has no security implications for a profile/device owner which would
already be able to self-grant. Delegated certificate installers did not
have this ability before.

This is only allowed at install-time- not afterward.

Bug: 24746231
Change-Id: Ia0ec290bb0bcde1d8137c188e2667cb7718dbfd7
2016-02-24 17:14:41 +00:00